[PATCH v2 02/16] PCI: acpiphp: Use common pci_stop_and_remove_bus_device()

Bjorn Helgaas bhelgaas at google.com
Fri Aug 17 19:35:55 EDT 2012


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

Signed-off-by: Bjorn Helgaas <bhelgaas at google.com>
---
 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 c25291c..b5d798e 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);
 	}
 




More information about the linux-pcmcia mailing list