Driver core: remove subsys_get()

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 2f77593..bc38085 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe);
 
 struct bus_type *get_bus(struct bus_type *bus)
 {
-       return bus ? container_of(subsys_get(&bus->subsys),
+       return bus ? container_of(kset_get(&bus->subsys),
                                struct bus_type, subsys) : NULL;
 }
 

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 50e3413..3e9b04c 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)
 static struct class *class_get(struct class *cls)
 {
        if (cls)
-               return container_of(subsys_get(&cls->subsys), struct class, subsys);
+               return container_of(kset_get(&cls->subsys), struct class, subsys);
        return NULL;
 }
 

diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index 45effed..c0fb535 100644 (file)
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);
 
-static inline struct kset *subsys_get(struct kset *s)
-{
-       if (s)
-               return kset_get(s);
-       return NULL;
-}
-
 struct subsys_attribute {
        struct attribute attr;
        ssize_t (*show)(struct kset *, char *);

diff --git a/lib/kobject.c b/lib/kobject.c
index 0aa4e90..1326041 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
        if (!s || !a)
                return -EINVAL;
 
-       if (subsys_get(s)) {
+       if (kset_get(s)) {
                error = sysfs_create_file(&s->kobj, &a->attr);
                kset_put(s);
        }