mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
Kobject: change drivers/base/sys.c 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 <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
64dbcac3a1
commit
61030bfb79
1 changed files with 6 additions and 10 deletions
|
|
@ -224,20 +224,15 @@ int sysdev_register(struct sys_device * sysdev)
|
|||
if (!cls)
|
||||
return -EINVAL;
|
||||
|
||||
pr_debug("Registering sys device '%s'\n", kobject_name(&sysdev->kobj));
|
||||
|
||||
/* Make sure the kset is set */
|
||||
sysdev->kobj.kset = &cls->kset;
|
||||
|
||||
/* But make sure we point to the right type for sysfs translation */
|
||||
sysdev->kobj.ktype = &ktype_sysdev;
|
||||
error = kobject_set_name(&sysdev->kobj, "%s%d",
|
||||
kobject_name(&cls->kset.kobj), sysdev->id);
|
||||
if (error)
|
||||
return error;
|
||||
|
||||
pr_debug("Registering sys device '%s'\n", kobject_name(&sysdev->kobj));
|
||||
|
||||
/* Register the object */
|
||||
error = kobject_register(&sysdev->kobj);
|
||||
error = kobject_init_and_add(&sysdev->kobj, &ktype_sysdev, NULL,
|
||||
"%s%d", kobject_name(&cls->kset.kobj),
|
||||
sysdev->id);
|
||||
|
||||
if (!error) {
|
||||
struct sysdev_driver * drv;
|
||||
|
|
@ -254,6 +249,7 @@ int sysdev_register(struct sys_device * sysdev)
|
|||
}
|
||||
mutex_unlock(&sysdev_drivers_lock);
|
||||
}
|
||||
kobject_uevent(&sysdev->kobj, KOBJ_ADD);
|
||||
return error;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue