Merge branch 'acpi-scan' into acpi-cleanup

The following commits depend on the 'acpi-scan' material.

19 files changed, 278 insertions, 572 deletions

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 2a4502becd13..4ee2e753306a 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -37,7 +37,7 @@ acpi-y				+= resource.o
 acpi-y                          += processor_core.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
-acpi-y                          += pci_root.o pci_link.o pci_irq.o pci_bind.o
+acpi-y                          += pci_root.o pci_link.o pci_irq.o
 acpi-y                          += acpi_platform.o
 acpi-y                          += power.o
 acpi-y                          += event.o
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index b679bf8478f7..03d18f290118 100644
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -157,38 +157,26 @@ static int
 acpi_memory_get_device(acpi_handle handle,
                        struct acpi_memory_device **mem_device)
 {
-        acpi_status status;
-        acpi_handle phandle;
         struct acpi_device *device = NULL;
-        struct acpi_device *pdevice = NULL;
         int result;
 
-
         if (!acpi_bus_get_device(handle, &device) && device)
                 goto end;
 
-        status = acpi_get_parent(handle, &phandle);
-        if (ACPI_FAILURE(status)) {
-                ACPI_EXCEPTION((AE_INFO, status, "Cannot find acpi parent"));
-                return -EINVAL;
-        }
-
-        /* Get the parent device */
-        result = acpi_bus_get_device(phandle, &pdevice);
-        if (result) {
-                acpi_handle_warn(phandle, "Cannot get acpi bus device\n");
-                return -EINVAL;
-        }
-
         /*
          * Now add the notified device.  This creates the acpi_device
          * and invokes .add function
          */
-        result = acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE);
+        result = acpi_bus_scan(handle);
         if (result) {
                 acpi_handle_warn(handle, "Cannot add acpi bus\n");
                 return -EINVAL;
         }
+        result = acpi_bus_get_device(handle, &device);
+        if (result) {
+                acpi_handle_warn(handle, "Missing device object\n");
+                return -EINVAL;
+        }
 
       end:
         *mem_device = acpi_driver_data(device);
@@ -355,7 +343,7 @@ static void acpi_memory_device_notify(acpi_handle handle, u32 event, void *data)
                         break;
                 }
 
-                ej_event->handle = handle;
+                ej_event->device = device;
                 ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
                 acpi_os_hotplug_execute(acpi_bus_hot_remove_device,
                                         (void *)ej_event);
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 811910b50b75..cc79d3e53a39 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -135,30 +135,6 @@ static int acpi_container_remove(struct acpi_device *device, int type)
         return status;
 }
 
-static int container_device_add(struct acpi_device **device, acpi_handle handle)
-{
-        acpi_handle phandle;
-        struct acpi_device *pdev;
-        int result;
-
-
-        if (acpi_get_parent(handle, &phandle)) {
-                return -ENODEV;
-        }
-
-        if (acpi_bus_get_device(phandle, &pdev)) {
-                return -ENODEV;
-        }
-
-        if (acpi_bus_add(device, pdev, handle, ACPI_BUS_TYPE_DEVICE)) {
-                return -ENODEV;
-        }
-
-        result = acpi_bus_start(*device);
-
-        return result;
-}
-
 static void container_notify_cb(acpi_handle handle, u32 type, void *context)
 {
         struct acpi_device *device = NULL;
@@ -190,11 +166,16 @@ static void container_notify_cb(acpi_handle handle, u32 type, void *context)
                 if (!ACPI_FAILURE(status) || device)
                         break;
 
-                result = container_device_add(&device, handle);
+                result = acpi_bus_scan(handle);
                 if (result) {
                         acpi_handle_warn(handle, "Failed to add container\n");
                         break;
                 }
+                result = acpi_bus_get_device(handle, &device);
+                if (result) {
+                        acpi_handle_warn(handle, "Missing device object\n");
+                        break;
+                }
 
                 kobject_uevent(&device->dev.kobj, KOBJ_ONLINE);
                 ost_code = ACPI_OST_SC_SUCCESS;
diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
index c6ff606c6d5b..995019063f64 100644
--- a/drivers/acpi/device_pm.c
+++ b/drivers/acpi/device_pm.c
@@ -353,7 +353,7 @@ int acpi_pm_device_sleep_wake(struct device *dev, bool enable)
  * acpi_dev_pm_get_node - Get ACPI device node for the given physical device.
  * @dev: Device to get the ACPI node for.
  */
-static struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
+struct acpi_device *acpi_dev_pm_get_node(struct device *dev)
 {
         acpi_handle handle = DEVICE_ACPI_HANDLE(dev);
         struct acpi_device *adev;
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index f32bd47b35e0..420d24fc9388 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -310,8 +310,6 @@ static int dock_present(struct dock_station *ds)
 static struct acpi_device * dock_create_acpi_device(acpi_handle handle)
 {
         struct acpi_device *device;
-        struct acpi_device *parent_device;
-        acpi_handle parent;
         int ret;