From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 17 Aug 2012 16:03:47 +0000 (-0600)
Subject: PCI: acpiphp: Use common pci_stop_and_remove_bus_device()
X-Git-Tag: v3.7-rc1~177^2~15^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=34e548431a7a2e73121c4a452eb3d1b0659bd77f;p=thirdparty%2Flinux.git

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 c25291c74353f..b5d798eef0170 100644
--- 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);
 	}