PCI: acpiphp: Use common pci_stop_and_remove_bus_device()
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 17 Aug 2012 16:03:47 +0000 (10:03 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 22 Aug 2012 17:31:08 +0000 (11:31 -0600)
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>
drivers/pci/hotplug/acpiphp_glue.c

index c25291c..b5d798e 100644 (file)
@@ -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);
        }