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>
This commit is contained in:
parent
52840bd628
commit
60728d62e4
|
@ -546,8 +546,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;
|
||||
class_dev->kobj.ktype = &class_device_ktype;
|
||||
kobject_init(&class_dev->kobj);
|
||||
kobject_init_ng(&class_dev->kobj, &class_device_ktype);
|
||||
INIT_LIST_HEAD(&class_dev->node);
|
||||
}
|
||||
|
||||
|
@ -575,16 +574,13 @@ int class_device_add(struct class_device *class_dev)
|
|||
class_dev->class_id);
|
||||
|
||||
/* first, register with generic layer. */
|
||||
error = kobject_set_name(&class_dev->kobj, "%s", class_dev->class_id);
|
||||
if (error)
|
||||
goto out2;
|
||||
|
||||
if (parent_class_dev)
|
||||
class_dev->kobj.parent = &parent_class_dev->kobj;
|
||||
else
|
||||
class_dev->kobj.parent = &parent_class->subsys.kobj;
|
||||
|
||||
error = kobject_add(&class_dev->kobj);
|
||||
error = kobject_add_ng(&class_dev->kobj, class_dev->kobj.parent,
|
||||
"%s", class_dev->class_id);
|
||||
if (error)
|
||||
goto out2;
|
||||
|
||||
|
|
Loading…
Reference in New Issue