From 886784e44671a41dc1afed069359ecd6f6028942 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: 67942 b: refs/heads/master c:
 1ef4cfac01fb5e98900f5bdb2a722aac1daff11b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f78f7ce5a441..4ea34072c4b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e9d930d167f8957a12a80515f3c417a98296378
+refs/heads/master: 1ef4cfac01fb5e98900f5bdb2a722aac1daff11b
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 2f775936544b..bc38085dbb10 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -728,7 +728,7 @@ EXPORT_SYMBOL_GPL(device_reprobe);
 
 struct bus_type *get_bus(struct bus_type *bus)
 {
-	return bus ? container_of(subsys_get(&bus->subsys),
+	return bus ? container_of(kset_get(&bus->subsys),
 				struct bus_type, subsys) : NULL;
 }
 
diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
index 50e34132576c..3e9b04c30fb9 100644
--- a/trunk/drivers/base/class.c
+++ b/trunk/drivers/base/class.c
@@ -93,7 +93,7 @@ void class_remove_file(struct class * cls, const struct class_attribute * attr)
 static struct class *class_get(struct class *cls)
 {
 	if (cls)
-		return container_of(subsys_get(&cls->subsys), struct class, subsys);
+		return container_of(kset_get(&cls->subsys), struct class, subsys);
 	return NULL;
 }
 
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 45effedff315..c0fb535d7acd 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -231,13 +231,6 @@ extern void subsystem_init(struct kset *);
 extern int __must_check subsystem_register(struct kset *);
 extern void subsystem_unregister(struct kset *);
 
-static inline struct kset *subsys_get(struct kset *s)
-{
-	if (s)
-		return kset_get(s);
-	return NULL;
-}
-
 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 0aa4e906916a..1326041213dd 100644
--- a/trunk/lib/kobject.c
+++ b/trunk/lib/kobject.c
@@ -679,7 +679,7 @@ int subsys_create_file(struct kset *s, struct subsys_attribute *a)
 	if (!s || !a)
 		return -EINVAL;
 
-	if (subsys_get(s)) {
+	if (kset_get(s)) {
 		error = sysfs_create_file(&s->kobj, &a->attr);
 		kset_put(s);
 	}