Merge branch 'pci/acpi-scan2' into next

* pci/acpi-scan2:
  ACPI / scan: Drop acpi_bus_add() and use acpi_bus_scan() instead
  ACPI: update ej_event interface to take acpi_device
  ACPI / scan: Add second pass to acpi_bus_trim()
  ACPI / scan: Change the implementation of acpi_bus_trim()
  ACPI / scan: Drop the second argument of acpi_bus_trim()
  ACPI / scan: Drop the second argument of acpi_device_unregister()
  ACPI: Remove the ops field from struct acpi_device
  ACPI: remove unused acpi_op_bind and acpi_op_unbind
  ACPI / scan: Fix check of device_attach() return value.

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 91b5ad875c53..9e2b1f6dbe41 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -742,11 +742,11 @@ static int acpiphp_bus_add(struct acpiphp_func *func)
                 /* this shouldn't be in here, so remove
                  * the bus then re-add it...
                  */
-                ret_val = acpi_bus_trim(device, 1);
+                ret_val = acpi_bus_trim(device);
                 dbg("acpi_bus_trim return %x\n", ret_val);
         }
 
-        ret_val = acpi_bus_add(func->handle);
+        ret_val = acpi_bus_scan(func->handle);
         if (!ret_val)
                 ret_val = acpi_bus_get_device(func->handle, &device);
 
@@ -772,7 +772,7 @@ static int acpiphp_bus_trim(acpi_handle handle)
                 return retval;
         }
 
-        retval = acpi_bus_trim(device, 1);
+        retval = acpi_bus_trim(device);
         if (retval)
                 err("cannot remove from acpi list\n");
 
@@ -1129,7 +1129,7 @@ static void handle_bridge_insertion(acpi_handle handle, u32 type)
                 return;
         }
 
-        if (acpi_bus_add(handle)) {
+        if (acpi_bus_scan(handle)) {
                 err("cannot add bridge to acpi list\n");
                 return;
         }
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index 24dace645871..180e760c1653 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -444,9 +444,9 @@ static int enable_slot(struct hotplug_slot *bss_hotplug_slot)
                         if (ACPI_SUCCESS(ret) &&
                             (adr>>16) == (slot->device_num + 1)) {
 
-                                ret = acpi_bus_add(chandle);
+                                ret = acpi_bus_scan(chandle);
                                 if (ACPI_FAILURE(ret)) {
-                                        printk(KERN_ERR "%s: acpi_bus_add "
+                                        printk(KERN_ERR "%s: acpi_bus_scan "
                                                "failed (0x%x) for slot %d "
                                                "func %d\n", __func__,
                                                ret, (int)(adr>>16),
@@ -531,7 +531,7 @@ static int disable_slot(struct hotplug_slot *bss_hotplug_slot)
                                 ret = acpi_bus_get_device(chandle,
                                                           &device);
                                 if (ACPI_SUCCESS(ret))
-                                        acpi_bus_trim(device, 1);
+                                        acpi_bus_trim(device);
                         }
                 }