aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-09-26 11:12:00 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-12 14:51:11 -0700
commite4bc16621d82ee1fd3685dcbf889a7c49891847b (patch)
treeff851444f752264f009ff464160e040be61282b9
parenta4e8b912541d5372ae049a3b7c1979968e52c40b (diff)
downloadlinux-2.6.34-ux500-e4bc16621d82ee1fd3685dcbf889a7c49891847b.tar.gz
driver core: remove subsystem_init()
There is only one user of it, and it is only a wrapper for kset_init(). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--Documentation/kobject.txt1
-rw-r--r--drivers/base/class.c2
-rw-r--r--include/linux/kobject.h1
-rw-r--r--lib/kobject.c5
4 files changed, 1 insertions, 8 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
index 5e7aca26135..ca86a885ad8 100644
--- a/Documentation/kobject.txt
+++ b/Documentation/kobject.txt
@@ -238,7 +238,6 @@ kobj_set_kset_s(obj,subsys)
- Assumes that obj->kobj exists, and is a struct kobject.
- Sets the kset of that kobject to the kset <subsys>.
-void subsystem_init(struct kset *s);
int subsystem_register(struct kset *s);
void subsystem_unregister(struct kset *s);
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 3e9b04c30fb..5b9cf06eab8 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -861,7 +861,7 @@ int __init classes_init(void)
/* ick, this is ugly, the things we go through to keep from showing up
* in sysfs... */
- subsystem_init(&class_obj_subsys);
+ kset_init(&class_obj_subsys);
if (!class_obj_subsys.kobj.parent)
class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
return 0;
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index a8a84fcccbc..05cc5b2ddff 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -217,7 +217,6 @@ extern struct kset hypervisor_subsys;
#define kobj_set_kset_s(obj,subsys) \
(obj)->kobj.kset = &(subsys)
-extern void subsystem_init(struct kset *);
extern int __must_check subsystem_register(struct kset *);
extern void subsystem_unregister(struct kset *);
diff --git a/lib/kobject.c b/lib/kobject.c
index fc6db6b4bfc..b7e0646f797 100644
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -617,11 +617,6 @@ struct kobject * kset_find_obj(struct kset * kset, const char * name)
return ret;
}
-void subsystem_init(struct kset *s)
-{
- kset_init(s);
-}
-
int subsystem_register(struct kset *s)
{
return kset_register(s);