From: Greg Kroah-Hartman Date: Tue, 18 Dec 2007 06:05:35 +0000 (-0700) Subject: Kobject: convert drivers/base/core.c to use kobject_init/add_ng() X-Git-Tag: v2.6.25-rc1~1243^2~66 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9990513c1ef040528c4e38163a073089d39c7903;p=linux-2.6-omap-h63xx.git Kobject: convert drivers/base/core.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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/core.c b/drivers/base/core.c index b3a931fe6b1..beb35160067 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -523,8 +523,7 @@ static void klist_children_put(struct klist_node *n) void device_initialize(struct device *dev) { dev->kobj.kset = devices_kset; - dev->kobj.ktype = &device_ktype; - kobject_init(&dev->kobj); + kobject_init_ng(&dev->kobj, &device_ktype); klist_init(&dev->klist_children, klist_children_get, klist_children_put); INIT_LIST_HEAD(&dev->dma_pools); @@ -729,7 +728,7 @@ static void device_remove_class_symlinks(struct device *dev) * This is part 2 of device_register(), though may be called * separately _iff_ device_initialize() has been called separately. * - * This adds it to the kobject hierarchy via kobject_add(), adds it + * This adds it to the kobject hierarchy via kobject_add_ng(), adds it * to the global and sibling lists for the device, then * adds it to the other relevant subsystems of the driver model. */ @@ -760,8 +759,7 @@ int device_add(struct device *dev) goto Error; /* first, register with generic layer. */ - kobject_set_name(&dev->kobj, "%s", dev->bus_id); - error = kobject_add(&dev->kobj); + error = kobject_add_ng(&dev->kobj, dev->kobj.parent, "%s", dev->bus_id); if (error) goto Error;