1 files changed, 21 insertions, 96 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 3affc6472e65..f09b1010d477 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -46,6 +46,7 @@
 #include <linux/kernel.h>
 #include <linux/pci.h>
 #include <linux/pci_hotplug.h>
+#include <linux/pci-acpi.h>
 #include <linux/mutex.h>
 
 #include "../pci.h"
@@ -62,61 +63,6 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus);
 static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);
 static void handle_hotplug_event_func(acpi_handle handle, u32 type, void *context);
 
-
-/*
- * initialization & terminatation routines
- */
-
-/**
- * is_ejectable - determine if a slot is ejectable
- * @handle: handle to acpi namespace
- *
- * Ejectable slot should satisfy at least these conditions:
- *
- *  1. has _ADR method
- *  2. has _EJ0 method
- *
- * optionally
- *
- *  1. has _STA method
- *  2. has _PS0 method
- *  3. has _PS3 method
- *  4. ..
- */
-static int is_ejectable(acpi_handle handle)
-{
-        acpi_status status;
-        acpi_handle tmp;
-
-        status = acpi_get_handle(handle, "_ADR", &tmp);
-        if (ACPI_FAILURE(status)) {
-                return 0;
-        }
-
-        status = acpi_get_handle(handle, "_EJ0", &tmp);
-        if (ACPI_FAILURE(status)) {
-                return 0;
-        }
-
-        return 1;
-}
-
-
-/* callback routine to check for the existence of ejectable slots */
-static acpi_status
-is_ejectable_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
-{
-        int *count = (int *)context;
-
-        if (is_ejectable(handle)) {
-                (*count)++;
-                /* only one ejectable slot is enough */
-                return AE_CTRL_TERMINATE;
-        } else {
-                return AE_OK;
-        }
-}
-
 /* callback routine to check for the existence of a pci dock device */
 static acpi_status
 is_pci_dock_device(acpi_handle handle, u32 lvl, void *context, void **rv)
@@ -131,9 +77,6 @@ is_pci_dock_device(acpi_handle handle, u32 lvl, void *context, void **rv)
         }
 }
 
-
-
-
 /*
  * the _DCK method can do funny things... and sometimes not
  * hah-hah funny.
@@ -160,9 +103,9 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
 
         if (((buses >> 8) & 0xff) != bus->secondary) {
                 buses = (buses & 0xff000000)
-                        | ((unsigned int)(bus->primary)     <<  0)
-                        | ((unsigned int)(bus->secondary)   <<  8)
-                        | ((unsigned int)(bus->subordinate) << 16);
+                        | ((unsigned int)(bus->primary)     <<  0)
+                        | ((unsigned int)(bus->secondary)   <<  8)
+                        | ((unsigned int)(bus->subordinate) << 16);
                 pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses);
         }
         return NOTIFY_OK;
@@ -184,17 +127,12 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         acpi_status status = AE_OK;
         unsigned long long adr, sun;
         int device, function, retval;
+        struct pci_bus *pbus = bridge->pci_bus;
 
-        status = acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
-
-        if (ACPI_FAILURE(status))
-                return AE_OK;
-
-        status = acpi_get_handle(handle, "_EJ0", &tmp);
-
-        if (ACPI_FAILURE(status) && !(is_dock_device(handle)))
+        if (!acpi_pci_check_ejectable(pbus, handle) && !is_dock_device(handle))
                 return AE_OK;
 
+        acpi_evaluate_integer(handle, "_ADR", NULL, &adr);
         device = (adr >> 16) & 0xffff;
         function = adr & 0xffff;
 
@@ -205,7 +143,8 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         INIT_LIST_HEAD(&newfunc->sibling);
         newfunc->handle = handle;
         newfunc->function = function;
-        if (ACPI_SUCCESS(status))
+
+        if (ACPI_SUCCESS(acpi_get_handle(handle, "_EJ0", &tmp)))
                 newfunc->flags = FUNC_HAS_EJ0;
 
         if (ACPI_SUCCESS(acpi_get_handle(handle, "_STA", &tmp)))
@@ -256,8 +195,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                 bridge->nr_slots++;
 
                 dbg("found ACPI PCI Hotplug slot %llu at PCI %04x:%02x:%02x\n",
-                                slot->sun, pci_domain_nr(bridge->pci_bus),
-                                bridge->pci_bus->number, slot->device);
+                    slot->sun, pci_domain_nr(pbus), pbus->number, device);
                 retval = acpiphp_register_hotplug_slot(slot);
                 if (retval) {
                         if (retval == -EBUSY)
@@ -274,8 +212,7 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
         list_add_tail(&newfunc->sibling, &slot->funcs);
 
         /* associate corresponding pci_dev */
-        newfunc->pci_dev = pci_get_slot(bridge->pci_bus,
-                                         PCI_DEVFN(device, function));
+        newfunc->pci_dev = pci_get_slot(pbus, PCI_DEVFN(device, function));
         if (newfunc->pci_dev) {
                 slot->flags |= (SLOT_ENABLED | SLOT_POWEREDON);
         }
@@ -324,27 +261,15 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
 
 
 /* see if it's worth looking at this bridge */
-static int detect_ejectable_slots(acpi_handle *bridge_handle)
+static int detect_ejectable_slots(struct pci_bus *pbus)
 {
-        acpi_status status;
-        int count;
-
-        count = 0;
-
-        /* only check slots defined directly below bridge object */
-        status = acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,
-                                     is_ejectable_slot, (void *)&count, NULL);
-
-        /*
-         * we also need to add this bridge if there is a dock bridge or
-         * other pci device on a dock station (removable)
-         */
-        if (!count)
-                status = acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle,
-                                (u32)1, is_pci_dock_device, (void *)&count,
-                                NULL);
-
-        return count;
+        int found = acpi_pci_detect_ejectable(pbus);
+        if (!found) {
+                acpi_handle bridge_handle = acpi_pci_get_bridge_handle(pbus);
+                acpi_walk_namespace(ACPI_TYPE_DEVICE, bridge_handle, (u32)1,
+                                    is_pci_dock_device, (void *)&found, NULL);
+        }
+        return found;
 }
 
 
@@ -554,7 +479,7 @@ find_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
                 goto out;
 
         /* check if this bridge has ejectable slots */
-        if ((detect_ejectable_slots(handle) > 0)) {
+        if ((detect_ejectable_slots(dev->subordinate) > 0)) {
                 dbg("found PCI-to-PCI bridge at PCI %s\n", pci_name(dev));
                 add_p2p_bridge(handle, dev);
         }
@@ -615,7 +540,7 @@ static int add_bridge(acpi_handle handle)
         }
 
         /* check if this bridge has ejectable slots */
-        if (detect_ejectable_slots(handle) > 0) {
+        if (detect_ejectable_slots(pci_bus) > 0) {
                 dbg("found PCI host-bus bridge with hot-pluggable slots\n");
                 add_host_bridge(handle, pci_bus);
         }