On Fri, Sep 14, 2012 at 8:05 PM, Jiang Liu <liuj97@xxxxxxxxx> wrote:
> From: Jiang Liu <jiang.liu@xxxxxxxxxx>
>
> Now ACPI devices are created before/destroyed after corresponding PCI
> devices, and acpi_platform_notify/acpi_platform_notify_remove will
> update PCI<->ACPI binding relationship when creating/destroying PCI
> devices, there's no need to invoke bind/unbind callbacks from ACPI
> device probe/destroy routines anymore. So remove bind/unbind callbacks
> from acpi_device_ops.
>
> Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx>
> Signed-off-by: Yijing Wang <wangyijing@xxxxxxxxxx>
> ---
> drivers/acpi/pci_bind.c | 100 +++++++++----------------------------------
> drivers/acpi/pci_root.c | 9 ----
> drivers/acpi/scan.c | 21 +--------
> include/acpi/acpi_bus.h | 4 --
> include/acpi/acpi_drivers.h | 1 -
> 5 files changed, 23 insertions(+), 112 deletions(-)
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index d1ecca2..f31cb2f 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -1232,17 +1232,8 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
> dev->removal_type = ACPI_BUS_REMOVAL_EJECT;
> device_release_driver(&dev->dev);
>
> - if (!rmdevice)
> - return 0;
> -
> - /*
> - * unbind _ADR-Based Devices when hot removal
> - */
> - if (dev->flags.bus_address) {
> - if ((dev->parent) && (dev->parent->ops.unbind))
> - dev->parent->ops.unbind(dev);
> - }
> - acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
> + if (rmdevice)
> + acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
>
> return 0;
> }
for pci root bus, acpi_bus_trim() is used to remove acpi_device.
and later in acpi_pci_root_remove to stop pci drivers/ioapic driver,
iommu driver then remove pci devices.
if call back is removed there, then could some functions in
acpi_pci_unbind() will be skipped.
I really do not want to add pci_stop_bus_devices() in
pci_root_hp.c::handle_root_bridge_removal before
calling acpi_bus_trim...
Thanks
Yinghai
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
