From 4c3e14c76e1914a97aecc26aceecb72de6b3d79f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Oct 2007 23:22:26 -0500 Subject: [PATCH] --- yaml --- r: 75749 b: refs/heads/master c: 443dbf9007854ef2892226615e23b60a35b89697 h: refs/heads/master i: 75747: c304d353388c03f8783cf593afc3799f079a6256 v: v3 --- [refs] | 2 +- trunk/drivers/base/class.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index ed2f4e72ab4b..9fc61c2a84b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59a548338ac6c9d7549c54278d0f724088585928 +refs/heads/master: 443dbf9007854ef2892226615e23b60a35b89697 diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c index 8ad98924cddb..d8a92c650b43 100644 --- a/trunk/drivers/base/class.c +++ b/trunk/drivers/base/class.c @@ -71,7 +71,7 @@ static struct kobj_type class_ktype = { }; /* Hotplug events for classes go to the class_obj subsys */ -static decl_subsys(class, NULL); +static struct kset *class_kset; int class_create_file(struct class * cls, const struct class_attribute * attr) @@ -149,7 +149,7 @@ int class_register(struct class * cls) if (error) return error; - cls->subsys.kobj.kset = &class_subsys; + cls->subsys.kobj.kset = class_kset; cls->subsys.kobj.ktype = &class_ktype; error = subsystem_register(&cls->subsys); @@ -855,11 +855,9 @@ void class_interface_unregister(struct class_interface *class_intf) int __init classes_init(void) { - int retval; - - retval = subsystem_register(&class_subsys); - if (retval) - return retval; + class_kset = kset_create_and_add("class", NULL, NULL); + if (!class_kset) + return -ENOMEM; /* ick, this is ugly, the things we go through to keep from showing up * in sysfs... */