summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-08-17 18:03:47 +0200
committerBjorn Helgaas <bhelgaas@google.com>2012-08-22 19:31:08 +0200
commit34e548431a7a2e73121c4a452eb3d1b0659bd77f (patch)
treecc922519095082d75107b4596c5924c3a67cf63e /drivers/pci
parentPCI: acpiphp: Stop disabling bridges on remove (diff)
downloadlinux-34e548431a7a2e73121c4a452eb3d1b0659bd77f.tar.xz
linux-34e548431a7a2e73121c4a452eb3d1b0659bd77f.zip
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>
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index c25291c74353..b5d798eef017 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);
}