ACPI / hotplug / PCI: Use pci_device_is_present()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 3 Mar 2014 23:48:57 +0000 (00:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 5 Mar 2014 00:28:06 +0000 (01:28 +0100)
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>
drivers/pci/hotplug/acpiphp_glue.c

index f2f460cba5f70a1de76b38cd0baa2a013de3424c..2d51bf7e9fe06b17d7b19456d5b0c7046c648435 100644 (file)
@@ -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)