aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-12-17 15:54:39 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:35 -0800
commitc8e90d822bff3e0502d004facedb05859f98055f (patch)
tree12d37b4c20ab4ff6e55adcfbfff2bae8fdbeed41 /drivers
parent7dc72b2842381684b864750af31a5fb168dec764 (diff)
Kobject: change drivers/base/bus to use kobject_init_and_add
Stop using kobject_register, as this way we can control the sending of the uevent properly, after everything is properly initialized. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/bus.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 937fc100b64..aea579365f6 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -643,15 +643,12 @@ int bus_add_driver(struct device_driver *drv)
if (!priv)
return -ENOMEM;
- error = kobject_set_name(&priv->kobj, "%s", drv->name);
- if (error)
- goto out_put_bus;
- priv->kobj.kset = bus->p->drivers_kset;
- priv->kobj.ktype = &driver_ktype;
klist_init(&priv->klist_devices, NULL, NULL);
priv->driver = drv;
drv->p = priv;
- error = kobject_register(&priv->kobj);
+ priv->kobj.kset = bus->p->drivers_kset;
+ error = kobject_init_and_add(&priv->kobj, &driver_ktype, NULL,
+ "%s", drv->name);
if (error)
goto out_put_bus;
@@ -681,6 +678,7 @@ int bus_add_driver(struct device_driver *drv)
__FUNCTION__, drv->name);
}
+ kobject_uevent(&priv->kobj, KOBJ_ADD);
return error;
out_unregister:
kobject_unregister(&priv->kobj);