aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/class.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-18 01:05:35 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:30 -0500
commit60728d62e4d273776e9ef9704f9ff8e8a248a8a1 (patch)
tree88efb1aaa9d022b6ea3af890108948dc866a1e96 /drivers/base/class.c
parent52840bd628707979b5bbcce3c506786d3a69dba0 (diff)
Kobject: convert drivers/base/class.c to use kobject_init/add_ng()
This converts the code to use the new kobject functions, cleaning up the logic in doing so. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base/class.c')
-rw-r--r--drivers/base/class.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 3ffcda753e78..ba6745b0fd2f 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -546,8 +546,7 @@ static struct class_device_attribute class_uevent_attr =
546void class_device_initialize(struct class_device *class_dev) 546void class_device_initialize(struct class_device *class_dev)
547{ 547{
548 class_dev->kobj.kset = &class_obj_subsys; 548 class_dev->kobj.kset = &class_obj_subsys;
549 class_dev->kobj.ktype = &class_device_ktype; 549 kobject_init_ng(&class_dev->kobj, &class_device_ktype);
550 kobject_init(&class_dev->kobj);
551 INIT_LIST_HEAD(&class_dev->node); 550 INIT_LIST_HEAD(&class_dev->node);
552} 551}
553 552
@@ -575,16 +574,13 @@ int class_device_add(struct class_device *class_dev)
575 class_dev->class_id); 574 class_dev->class_id);
576 575
577 /* first, register with generic layer. */ 576 /* first, register with generic layer. */
578 error = kobject_set_name(&class_dev->kobj, "%s", class_dev->class_id);
579 if (error)
580 goto out2;
581
582 if (parent_class_dev) 577 if (parent_class_dev)
583 class_dev->kobj.parent = &parent_class_dev->kobj; 578 class_dev->kobj.parent = &parent_class_dev->kobj;
584 else 579 else
585 class_dev->kobj.parent = &parent_class->subsys.kobj; 580 class_dev->kobj.parent = &parent_class->subsys.kobj;
586 581
587 error = kobject_add(&class_dev->kobj); 582 error = kobject_add_ng(&class_dev->kobj, class_dev->kobj.parent,
583 "%s", class_dev->class_id);
588 if (error) 584 if (error)
589 goto out2; 585 goto out2;
590 586