mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-23 07:01:23 +00:00
[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
1 changed files with 3 additions and 4 deletions
|
@ -184,8 +184,6 @@ int kobject_add(struct kobject * kobj)
|
||||||
unlink(kobj);
|
unlink(kobj);
|
||||||
if (parent)
|
if (parent)
|
||||||
kobject_put(parent);
|
kobject_put(parent);
|
||||||
} else {
|
|
||||||
kobject_hotplug(kobj, KOBJ_ADD);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return error;
|
return error;
|
||||||
|
@ -207,7 +205,8 @@ int kobject_register(struct kobject * kobj)
|
||||||
printk("kobject_register failed for %s (%d)\n",
|
printk("kobject_register failed for %s (%d)\n",
|
||||||
kobject_name(kobj),error);
|
kobject_name(kobj),error);
|
||||||
dump_stack();
|
dump_stack();
|
||||||
}
|
} else
|
||||||
|
kobject_hotplug(kobj, KOBJ_ADD);
|
||||||
} else
|
} else
|
||||||
error = -EINVAL;
|
error = -EINVAL;
|
||||||
return error;
|
return error;
|
||||||
|
@ -301,7 +300,6 @@ int kobject_rename(struct kobject * kobj, char *new_name)
|
||||||
|
|
||||||
void kobject_del(struct kobject * kobj)
|
void kobject_del(struct kobject * kobj)
|
||||||
{
|
{
|
||||||
kobject_hotplug(kobj, KOBJ_REMOVE);
|
|
||||||
sysfs_remove_dir(kobj);
|
sysfs_remove_dir(kobj);
|
||||||
unlink(kobj);
|
unlink(kobj);
|
||||||
}
|
}
|
||||||
|
@ -314,6 +312,7 @@ void kobject_del(struct kobject * kobj)
|
||||||
void kobject_unregister(struct kobject * kobj)
|
void kobject_unregister(struct kobject * kobj)
|
||||||
{
|
{
|
||||||
pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
|
pr_debug("kobject %s: unregistering\n",kobject_name(kobj));
|
||||||
|
kobject_hotplug(kobj, KOBJ_REMOVE);
|
||||||
kobject_del(kobj);
|
kobject_del(kobj);
|
||||||
kobject_put(kobj);
|
kobject_put(kobj);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue