Driver core: remove subsys_put()

There are no more subsystems, it's a kset now so remove the function and
the only two users, which are in the driver core.

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

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 625f7e694521e27adfad08b660df33033fc283e9..2f775936544b383af90e87570039b4521d5cf109 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -734,7 +734,7 @@ struct bus_type *get_bus(struct bus_type *bus)
 
 void put_bus(struct bus_type * bus)
 {
-       subsys_put(&bus->subsys);
+       kset_put(&bus->subsys);
 }
 
 

diff --git a/drivers/base/class.c b/drivers/base/class.c
index cf9cf666f47218b445b177875b2dcc35f0ffc929..50e34132576c9f99b8f13006777b1abe01867fca 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -100,7 +100,7 @@ static struct class *class_get(struct class *cls)
 static void class_put(struct class * cls)
 {
        if (cls)
-               subsys_put(&cls->subsys);
+               kset_put(&cls->subsys);
 }
 
 

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index ee61ef27e799c3c67a2bbaa44eab5b04059e5b47..45effedff315a80bd4fc5da7a419873d08d16bfc 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -238,11 +238,6 @@ static inline struct kset *subsys_get(struct kset *s)
        return NULL;
 }
 
-static inline void subsys_put(struct kset *s)
-{
-       kset_put(s);
-}
-
 struct subsys_attribute {
        struct attribute attr;
        ssize_t (*show)(struct kset *, char *);

diff --git a/lib/kobject.c b/lib/kobject.c
index 4b08e0ff95c8bf53745cd6d5257476e0d652b92c..0aa4e906916a6b379e75964c758c1083fb3fe79d 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -681,7 +681,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
 
        if (subsys_get(s)) {
                error = sysfs_create_file(&s->kobj, &a->attr);
-               subsys_put(s);
+               kset_put(s);
        }
        return error;
 }