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 2f775936544b383af90e87570039b4521d5cf109..bc38085dbb105d0c57cc820b92a2dc77b5c2efdf 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 50e34132576c9f99b8f13006777b1abe01867fca..3e9b04c30fb9753ac4da2ae7bc94698ac25e81a1 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 45effedff315a80bd4fc5da7a419873d08d16bfc..c0fb535d7acdf63b97ac4531ab51958417e14051 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 0aa4e906916a6b379e75964c758c1083fb3fe79d..1326041213ddde328c958823e7d18c01da16cb84 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);
        }