[PATCH] kobject/hotplug split - kobject add/remove
kobject_add() and kobject_del() don't emit hotplug events anymore. The user should do it itself if it has finished populating the device directory. Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7b558637b0
commit
18c3d5271b
|
@ -184,8 +184,6 @@ int kobject_add(struct kobject * kobj)
|
|||
unlink(kobj);
|
||||
if (parent)
|
||||
kobject_put(parent);
|
||||
} else {
|
||||
kobject_hotplug(kobj, KOBJ_ADD);
|
||||
}
|
||||
|
||||
return error;
|
||||
|
@ -207,7 +205,8 @@ int kobject_register(struct kobject * kobj)
|
|||
printk("kobject_register failed for %s (%d)\n",
|
||||
kobject_name(kobj),error);
|
||||
dump_stack();
|
||||
}
|
||||
} else
|
||||
kobject_hotplug(kobj, KOBJ_ADD);
|
||||
} else
|
||||
error = -EINVAL;
|
||||
return error;
|
||||
|
@ -301,7 +300,6 @@ int kobject_rename(struct kobject * kobj, char *new_name)
|
|||
|
||||
void kobject_del(struct kobject * kobj)
|
||||
{
|
||||
kobject_hotplug(kobj, KOBJ_REMOVE);
|
||||
sysfs_remove_dir(kobj);
|
||||
unlink(kobj);
|
||||
}
|
||||
|
@ -314,6 +312,7 @@ void kobject_del(struct kobject * kobj)
|
|||
void kobject_unregister(struct kobject * kobj)
|
||||
{
|
||||
pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
|
||||
kobject_hotplug(kobj, KOBJ_REMOVE);
|
||||
kobject_del(kobj);
|
||||
kobject_put(kobj);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue