From efbe25dbb3242110dca17c4d0f4620b88b24277e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 12 Sep 2007 15:06:57 -0700
Subject: [PATCH] --- yaml --- r: 67941 b: refs/heads/master c:
 6e9d930d167f8957a12a80515f3c417a98296378 h: refs/heads/master i:   67939:
 b21ecebd6e7a20814c264f69f6572f1e49e7254e v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/base/bus.c      | 2 +-
 trunk/drivers/base/class.c    | 2 +-
 trunk/include/linux/kobject.h | 5 -----
 trunk/lib/kobject.c           | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ed79f7c2afb3..f78f7ce5a441 100644
--- 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
index 625f7e694521..2f775936544b 100644
--- 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
index cf9cf666f472..50e34132576c 100644
--- 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
index ee61ef27e799..45effedff315 100644
--- 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
index 4b08e0ff95c8..0aa4e906916a 100644
--- 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;
 }