Merge back earlier 'acpi-pci-hotplug' material.

Conflicts:
	drivers/pci/hotplug/acpiphp_glue.c

diff --cc drivers/pci/hotplug/acpiphp_glue.c
index 7c7a388c85ab3679732f7971552790057abec4f5,fa8fe7441952d1eae6abef96278e27fa6148a714..91276f9fe26889f14c6a3e814b4495443aaa1bcb
--- 1/drivers/pci/hotplug/acpiphp_glue.c
--- 2/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@@ -755,9 -665,9 +676,9 @@@ static void trim_stale_devices(struct p
                acpi_status status;
                unsigned long long sta;
  
-               status = acpi_evaluate_integer(handle, "_STA", NULL, &sta);
+               status = acpi_evaluate_integer(adev->handle, "_STA", NULL, &sta);
 -              alive = (ACPI_SUCCESS(status) && sta == ACPI_STA_ALL)
 +              alive = (ACPI_SUCCESS(status) && device_status_valid(sta))
-                       || acpiphp_no_hotplug(handle);
+                       || acpiphp_no_hotplug(adev);
        }
        if (!alive) {
                u32 v;
@@@ -800,10 -710,9 +721,9 @@@ static void acpiphp_check_bridge(struc
                struct pci_bus *bus = slot->bus;
                struct pci_dev *dev, *tmp;
  
-               mutex_lock(&slot->crit_sect);
                if (slot_no_hotplug(slot)) {
                        ; /* do nothing */
 -              } else if (get_slot_status(slot) == ACPI_STA_ALL) {
 +              } else if (device_status_valid(get_slot_status(slot))) {
                        /* remove stale devices if any */
                        list_for_each_entry_safe_reverse(dev, tmp,
                                                         &bus->devices, bus_list)