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

login
register
mail settings
Submitter Bjorn Helgaas
Date Aug. 17, 2012, 11:35 p.m.
Message ID <20120817233555.10973.75372.stgit@bhelgaas.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/178407/
State Superseded
Headers show

Comments

Bjorn Helgaas - Aug. 17, 2012, 11:35 p.m.
Use pci_stop_and_remove_bus_device() like most other hotplug drivers
rather than stopping and removing separately.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/hotplug/acpiphp_glue.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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);
 	}