diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-17 12:03:47 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-08-22 13:31:08 -0400 |
commit | 34e548431a7a2e73121c4a452eb3d1b0659bd77f (patch) | |
tree | cc922519095082d75107b4596c5924c3a67cf63e | |
parent | 57fd9a4df562e7d2105a01ff57b4cdaa236c28ce (diff) |
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>
-rw-r--r-- | drivers/pci/hotplug/acpiphp_glue.c | 3 |
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) | |||
920 | * here. | 920 | * here. |
921 | */ | 921 | */ |
922 | while ((pdev = dev_in_slot(slot))) { | 922 | while ((pdev = dev_in_slot(slot))) { |
923 | pci_stop_bus_device(pdev); | 923 | pci_stop_and_remove_bus_device(pdev); |
924 | __pci_remove_bus_device(pdev); | ||
925 | pci_dev_put(pdev); | 924 | pci_dev_put(pdev); |
926 | } | 925 | } |
927 | 926 | ||