Driver core: change sysdev classes to use dynamic kobject names

[linux-2.6-omap-h63xx.git] / drivers / base / class.c

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 8e3cba2243841236afc6e725a803ff23eb8c1c2b..b962a76875d276349ffc9130734387e52a673126 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -466,7 +466,6 @@ static struct kset_uevent_ops class_uevent_ops = {
  * entirely soon.
  */
 static struct kset class_obj_subsys = {
-       .kobj = { .k_name = "class_obj", },
        .uevent_ops = &class_uevent_ops,
 };
 
@@ -553,7 +552,7 @@ static struct class_device_attribute class_uevent_attr =
 void class_device_initialize(struct class_device *class_dev)
 {
        class_dev->kobj.kset = &class_obj_subsys;
-       kobject_init_ng(&class_dev->kobj, &class_device_ktype);
+       kobject_init(&class_dev->kobj, &class_device_ktype);
        INIT_LIST_HEAD(&class_dev->node);
 }
 
@@ -872,6 +871,7 @@ int __init classes_init(void)
        /* ick, this is ugly, the things we go through to keep from showing up
         * in sysfs... */
        kset_init(&class_obj_subsys);
+       kobject_set_name(&class_obj_subsys.kobj, "class_obj");
        if (!class_obj_subsys.kobj.parent)
                class_obj_subsys.kobj.parent = &class_obj_subsys.kobj;
        return 0;