tree 1650bafc1dea2402bbb9902ed2d236ab4d4cb50c
parent 7b558637b0efc6ab3f3ca08f0b9cc0191665e9db
author [EMAIL PROTECTED] <[EMAIL PROTECTED]> Tue, 19 Apr 2005 11:57:34 -0700
committer Greg KH <[EMAIL PROTECTED]> Tue, 19 Apr 2005 11:57:34 -0700
[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 <[EMAIL PROTECTED]>
Signed-off-by: Greg Kroah-Hartman <[EMAIL PROTECTED]>
kobject.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
Index: lib/kobject.c
===================================================================
--- 79c5c5882b448e252d4dd3a3e8bde3c522103192/lib/kobject.c (mode:100644
sha1:ff9491986b381ccb1515a4b3a5dab8e28878d22c)
+++ 1650bafc1dea2402bbb9902ed2d236ab4d4cb50c/lib/kobject.c (mode:100644
sha1:5df8441c44e7d5decdabbfe1f83d8da5d82289fa)
@@ -184,8 +184,6 @@
unlink(kobj);
if (parent)
kobject_put(parent);
- } else {
- kobject_hotplug(kobj, KOBJ_ADD);
}
return error;
@@ -207,7 +205,8 @@
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 @@
void kobject_del(struct kobject * kobj)
{
- kobject_hotplug(kobj, KOBJ_REMOVE);
sysfs_remove_dir(kobj);
unlink(kobj);
}
@@ -314,6 +312,7 @@
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);
}
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
