[PATCH 08/75] Driver core: remove subsys_put()

Greg Kroah-Hartman
2007-10-12T22:21:55Z

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>
---
drivers/base/bus.c | 2 +-
drivers/base/class.c | 2 +-
include/linux/kobject.h | 5 -----
lib/kobject.c | 2 +-
4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 625f7e6..2f77593 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 cf9cf66..50e3413 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 ee61ef2..45effed 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 4b08e0f..0aa4e90 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;
}
--
1.5.3.4