Driver core: remove subsys_set_kset

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/bus.c b/drivers/base/bus.c
index ff850d1b0d92020648021f4aa77371225de98239..625f7e694521e27adfad08b660df33033fc283e9 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -823,7 +823,8 @@ int bus_register(struct bus_type * bus)
        if (retval)
                goto out;
 
-       subsys_set_kset(bus, bus_subsys);
+       bus->subsys.kobj.kset = &bus_subsys;
+
        retval = subsystem_register(&bus->subsys);
        if (retval)
                goto out;

diff --git a/drivers/base/class.c b/drivers/base/class.c
index ecd6336bffea69f338b1f5588e162494a81165de..cf9cf666f47218b445b177875b2dcc35f0ffc929 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -149,7 +149,7 @@ int class_register(struct class * cls)
        if (error)
                return error;
 
-       subsys_set_kset(cls, class_subsys);
+       cls->subsys.kobj.kset = &class_subsys;
 
        error = subsystem_register(&cls->subsys);
        if (!error) {

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