From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 3 Mar 2014 23:48:57 +0000 (+0100)
Subject: ACPI / hotplug / PCI: Use pci_device_is_present()
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b8a62d540240387c7e97a69127cab3ab9cadc70a;p=linux-beck.git

ACPI / hotplug / PCI: Use pci_device_is_present()

Make the ACPI-based PCI hotplug (ACPIPHP) code use
pci_device_is_present() for checking if devices are present instead
of open coding the same thing.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
---

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index f2f460cba5f7..2d51bf7e9fe0 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -689,12 +689,9 @@ static void trim_stale_devices(struct pci_dev *dev)
 		alive = (ACPI_SUCCESS(status) && device_status_valid(sta))
 			|| acpiphp_no_hotplug(adev);
 	}
-	if (!alive) {
-		u32 v;
+	if (!alive)
+		alive = pci_device_is_present(dev);
 
-		/* Check if the device responds. */
-		alive = pci_bus_read_dev_vendor_id(dev->bus, dev->devfn, &v, 0);
-	}
 	if (!alive) {
 		pci_stop_and_remove_bus_device(dev);
 		if (adev)