aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-09-12 18:06:57 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 17:51:01 -0400
commit6e9d930d167f8957a12a80515f3c417a98296378 (patch)
tree5050bc0b029c8d51d970e76c5ee5f59ed5e756b7
parent27f20e5e4e60a7f28010eeb34399fe0cc9a1a235 (diff)
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.c2
-rw-r--r--drivers/base/class.c2
-rw-r--r--include/linux/kobject.h5
-rw-r--r--lib/kobject.c2
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)
734 734
735void put_bus(struct bus_type * bus) 735void put_bus(struct bus_type * bus)
736{ 736{
737 subsys_put(&bus->subsys); 737 kset_put(&bus->subsys);
738} 738}
739 739
740 740
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)
100static void class_put(struct class * cls) 100static void class_put(struct class * cls)
101{ 101{
102 if (cls) 102 if (cls)
103 subsys_put(&cls->subsys); 103 kset_put(&cls->subsys);
104} 104}
105 105
106 106
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)
238 return NULL; 238 return NULL;
239} 239}
240 240
241static inline void subsys_put(struct kset *s)
242{
243 kset_put(s);
244}
245
246struct subsys_attribute { 241struct subsys_attribute {
247 struct attribute attr; 242 struct attribute attr;
248 ssize_t (*show)(struct kset *, char *); 243 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)
681 681
682 if (subsys_get(s)) { 682 if (subsys_get(s)) {
683 error = sysfs_create_file(&s->kobj, &a->attr); 683 error = sysfs_create_file(&s->kobj, &a->attr);
684 subsys_put(s); 684 kset_put(s);
685 } 685 }
686 return error; 686 return error;
687} 687}