From: Benjamin Herrenschmidt <[email protected]> Move the call to platform_notify_remove() to after the call to bus_remove_device(), where it belongs. It's bogus to notify the platform of removal while drivers are still attached to the device and possibly still operating since the platform might use this callback to tear down some resources used by the driver (ACPI bits, iommu table, ...) Signed-off-by: Benjamin Herrenschmidt <[email protected]> Cc: "Brown, Len" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/base/core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index f544adc..5d11bbd 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -682,6 +682,7 @@ void device_del(struct device * dev) device_remove_file(dev, &dev->uevent_attr); device_remove_groups(dev); device_remove_attrs(dev); + bus_remove_device(dev); /* Notify the platform of the removal, in case they * need to do anything... @@ -691,7 +692,6 @@ void device_del(struct device * dev) if (dev->bus) blocking_notifier_call_chain(&dev->bus->bus_notifier, BUS_NOTIFY_DEL_DEVICE, dev); - bus_remove_device(dev); device_pm_remove(dev); kobject_uevent(&dev->kobj, KOBJ_REMOVE); kobject_del(&dev->kobj); -- 1.4.4.1 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- Follow-Ups:
- References:
- [GIT PATCH] Driver core patches for 2.6.19
- From: Greg KH <[email protected]>
- [PATCH 1/36] Driver core: add notification of bus events
- From: Greg KH <[email protected]>
- [PATCH 2/36] Driver core: fix "driver" symlink timing
- From: Greg KH <[email protected]>
- [PATCH 3/36] Driver Core: Move virtual_device_parent() to core.c
- From: Greg KH <[email protected]>
- [PATCH 4/36] CONFIG_SYSFS_DEPRECATED
- From: Greg KH <[email protected]>
- [PATCH 5/36] Driver core: make old versions of udev work properly
- From: Greg KH <[email protected]>
- [PATCH 6/36] CONFIG_SYSFS_DEPRECATED - bus symlinks
- From: Greg KH <[email protected]>
- [PATCH 7/36] CONFIG_SYSFS_DEPRECATED - device symlinks
- From: Greg KH <[email protected]>
- [PATCH 8/36] CONFIG_SYSFS_DEPRECATED - PHYSDEV* uevent variables
- From: Greg KH <[email protected]>
- [PATCH 9/36] CONFIG_SYSFS_DEPRECATED - class symlinks
- From: Greg KH <[email protected]>
- [PATCH 10/36] Driver core: convert vt code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 11/36] Driver core: convert vc code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 12/36] Driver core: change misc class_devices to be real devices
- From: Greg KH <[email protected]>
- [PATCH 13/36] Driver core: convert tty core to use struct device
- From: Greg KH <[email protected]>
- [PATCH 14/36] Driver core: convert raw device code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 15/36] I2C: convert i2c-dev to use struct device instead of struct class_device
- From: Greg KH <[email protected]>
- [PATCH 16/36] Driver core: convert msr code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 17/36] Driver core: convert cpuid code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 18/36] Driver core: convert PPP code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 19/36] Driver core: convert ppdev code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 20/36] Driver core: convert mmc code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 22/36] Driver core: convert fb code to use struct device
- From: Greg KH <[email protected]>
- [PATCH 23/36] Driver core: change mem class_devices to be real devices
- From: Greg KH <[email protected]>
- [PATCH 24/36] Driver core: convert sound core to use struct device
- From: Greg KH <[email protected]>
- [PATCH 25/36] Driver core: add dev_archdata to struct device
- From: Greg KH <[email protected]>
- [PATCH 26/36] ACPI: Change ACPI to use dev_archdata instead of firmware_data
- From: Greg KH <[email protected]>
- [GIT PATCH] Driver core patches for 2.6.19
- Prev by Date: Re: [OHCI] BIOS handoff failed (BIOS bug?)
- Next by Date: Re: [Cluster-devel] Re: [GFS2] Change argument of gfs2_dinode_out [17/70]
- Previous by thread: [PATCH 26/36] ACPI: Change ACPI to use dev_archdata instead of firmware_data
- Next by thread: [PATCH 28/36] cpu topology: consider sysfs_create_group return value
- Index(es):