1 files changed, 14 insertions, 26 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 3d6d4fd1e3c5..91b5ad875c53 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -734,15 +734,9 @@ static unsigned char acpiphp_max_busnr(struct pci_bus *bus)
  */
 static int acpiphp_bus_add(struct acpiphp_func *func)
 {
-        acpi_handle phandle;
-        struct acpi_device *device, *pdevice;
+        struct acpi_device *device;
         int ret_val;
 
-        acpi_get_parent(func->handle, &phandle);
-        if (acpi_bus_get_device(phandle, &pdevice)) {
-                dbg("no parent device, assuming NULL\n");
-                pdevice = NULL;
-        }
         if (!acpi_bus_get_device(func->handle, &device)) {
                 dbg("bus exists... trim\n");
                 /* this shouldn't be in here, so remove
@@ -752,16 +746,13 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
                 dbg("acpi_bus_trim return %x\n", ret_val);
         }
 
-        ret_val = acpi_bus_add(&device, pdevice, func->handle,
-                ACPI_BUS_TYPE_DEVICE);
-        if (ret_val) {
-                dbg("error adding bus, %x\n",
-                        -ret_val);
-                goto acpiphp_bus_add_out;
-        }
-        ret_val = acpi_bus_start(device);
+        ret_val = acpi_bus_add(func->handle);
+        if (!ret_val)
+                ret_val = acpi_bus_get_device(func->handle, &device);
+
+        if (ret_val)
+                dbg("error adding bus, %x\n", -ret_val);
 
-acpiphp_bus_add_out:
         return ret_val;
 }
 
@@ -1130,8 +1121,7 @@ static int acpiphp_configure_bridge (acpi_handle handle)
 
 static void handle_bridge_insertion(acpi_handle handle, u32 type)
 {
-        struct acpi_device *device, *pdevice;
-        acpi_handle phandle;
+        struct acpi_device *device;
 
         if ((type != ACPI_NOTIFY_BUS_CHECK) &&
                         (type != ACPI_NOTIFY_DEVICE_CHECK)) {
@@ -1139,17 +1129,15 @@ static void handle_bridge_insertion(acpi_handle handle, u32 type)
                 return;
         }
 
-        acpi_get_parent(handle, &phandle);
-        if (acpi_bus_get_device(phandle, &pdevice)) {
-                dbg("no parent device, assuming NULL\n");
-                pdevice = NULL;
-        }
-        if (acpi_bus_add(&device, pdevice, handle, ACPI_BUS_TYPE_DEVICE)) {
+        if (acpi_bus_add(handle)) {
                 err("cannot add bridge to acpi list\n");
                 return;
         }
-        if (!acpiphp_configure_bridge(handle) &&
-                !acpi_bus_start(device))
+        if (acpi_bus_get_device(handle, &device)) {
+                err("ACPI device object missing\n");
+                return;
+        }
+        if (!acpiphp_configure_bridge(handle))
                 add_bridge(handle);
         else
                 err("cannot configure and start bridge\n");