4 files changed, 3 insertions, 8 deletions

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 625f7e694521..2f775936544b 100644
--- 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 cf9cf666f472..50e34132576c 100644
--- 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 ee61ef27e799..45effedff315 100644
--- 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 4b08e0ff95c8..0aa4e906916a 100644
--- 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;
 }