diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-12 15:06:57 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 14:51:01 -0700 |
| commit | 6e9d930d167f8957a12a80515f3c417a98296378 (patch) | |
| tree | 5050bc0b029c8d51d970e76c5ee5f59ed5e756b7 | |
| parent | 27f20e5e4e60a7f28010eeb34399fe0cc9a1a235 (diff) | |
| download | linux-3.10-6e9d930d167f8957a12a80515f3c417a98296378.tar.gz linux-3.10-6e9d930d167f8957a12a80515f3c417a98296378.tar.bz2 linux-3.10-6e9d930d167f8957a12a80515f3c417a98296378.zip | |
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>
| -rw-r--r-- | drivers/base/bus.c | 2 | ||||
| -rw-r--r-- | drivers/base/class.c | 2 | ||||
| -rw-r--r-- | include/linux/kobject.h | 5 | ||||
| -rw-r--r-- | lib/kobject.c | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 625f7e69452..2f775936544 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 cf9cf666f47..50e34132576 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 ee61ef27e79..45effedff31 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 4b08e0ff95c..0aa4e906916 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; } |