Driver core: remove kset_set_kset_s

This macro is only used by the driver core and is held over from when we
had subsystems.  It is not needed anymore.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 18febe26caa1c3640fc9d4df27e6a66775b4665f..7ad893167823d0102f74d52deb654a2f276d88ef 100644 (file)
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -139,7 +139,7 @@ int sysdev_class_register(struct sysdev_class * cls)
                 kobject_name(&cls->kset.kobj));
        INIT_LIST_HEAD(&cls->drivers);
        cls->kset.kobj.parent = &system_subsys.kobj;
-       kset_set_kset_s(cls, system_subsys);
+       cls->kset.kobj.kset = &system_subsys;
        return kset_register(&cls->kset);
 }
 

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 0713799fde29cc0a41626f7522997ae4ca8d166c..ee61ef27e799c3c67a2bbaa44eab5b04059e5b47 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -227,20 +227,6 @@ extern struct kset hypervisor_subsys;
 #define kobj_set_kset_s(obj,subsys) \
        (obj)->kobj.kset = &(subsys)
 
-/**
- *     kset_set_kset_s(obj,subsys) - set kset for embedded kset.
- *     @obj:           ptr to some object type.
- *     @subsys:        a subsystem object (not a ptr).
- *
- *     Can be used for any object type with an embedded ->kset.
- *     Sets the kset of @obj's  embedded kobject (via its embedded
- *     kset) to @subsys.kset. This makes @obj a member of that 
- *     kset.
- */
-
-#define kset_set_kset_s(obj,subsys) \
-       (obj)->kset.kobj.kset = &(subsys)
-
 extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);