---

yaml --- r: 67941 b: refs/heads/master c: 6e9d930 h: refs/heads/master i: 67939: b21eceb v: v3
git-mirror · Oct 12, 2007 · efbe25d · efbe25d
1 parent 4b2421d
commit efbe25d
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 27f20e5e4e60a7f28010eeb34399fe0cc9a1a235
+refs/heads/master: 6e9d930d167f8957a12a80515f3c417a98296378
diff --git a/trunk/drivers/base/bus.c b/trunk/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/trunk/drivers/base/class.c b/trunk/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/trunk/include/linux/kobject.h b/trunk/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/trunk/lib/kobject.c b/trunk/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;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
@@ Expand Down @@