diff options
author | kay.sievers@vrfy.org <kay.sievers@vrfy.org> | 2005-04-19 00:57:36 -0400 |
---|---|---|
committer | Greg KH <greg@press.kroah.org> | 2005-04-19 00:57:36 -0400 |
commit | e57cd73e2e844a3da25cc6b420674c81bbe1b387 (patch) | |
tree | e173c8c8cac2e0b01457a6e796887db1c141340b | |
parent | b41148c0d8d2fa0c36cebd9ba3ee4cfc0dc7cb9a (diff) |
[PATCH] kobject/hotplug split - devices core
kobject_add() and kobject_del() don't emit hotplug events anymore. Do it
ourselves if we are finished populating the device directory.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/base/core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c index 4e6cce8e6d35..a7cedd8cefe5 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c | |||
@@ -260,6 +260,8 @@ int device_add(struct device *dev) | |||
260 | /* notify platform of device entry */ | 260 | /* notify platform of device entry */ |
261 | if (platform_notify) | 261 | if (platform_notify) |
262 | platform_notify(dev); | 262 | platform_notify(dev); |
263 | |||
264 | kobject_hotplug(&dev->kobj, KOBJ_ADD); | ||
263 | Done: | 265 | Done: |
264 | put_device(dev); | 266 | put_device(dev); |
265 | return error; | 267 | return error; |
@@ -349,6 +351,7 @@ void device_del(struct device * dev) | |||
349 | platform_notify_remove(dev); | 351 | platform_notify_remove(dev); |
350 | bus_remove_device(dev); | 352 | bus_remove_device(dev); |
351 | device_pm_remove(dev); | 353 | device_pm_remove(dev); |
354 | kobject_hotplug(&dev->kobj, KOBJ_REMOVE); | ||
352 | kobject_del(&dev->kobj); | 355 | kobject_del(&dev->kobj); |
353 | if (parent) | 356 | if (parent) |
354 | put_device(parent); | 357 | put_device(parent); |