PCI: acpiphp: Use common pci_stop_and_remove_bus_device()

Use pci_stop_and_remove_bus_device() like most other hotplug drivers
rather than stopping and removing separately.

Tested-by: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index c25291c74353f62074af9e813ca4a03ae0cf63b8..b5d798eef017070aa75d652759ab5a2f291588cb 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -920,8 +920,7 @@ static int disable_device(struct acpiphp_slot *slot)
         * here.
         */
        while ((pdev = dev_in_slot(slot))) {
-               pci_stop_bus_device(pdev);
-               __pci_remove_bus_device(pdev);
+               pci_stop_and_remove_bus_device(pdev);
                pci_dev_put(pdev);
        }