ACPI / scan: Drop the second argument of acpi_bus_trim()

All callers of acpi_bus_trim() pass 1 (true) as the second argument
of it, so remove that argument entirely and change acpi_bus_trim()
to always behave as though it were 1.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Toshi Kani <toshi.kani@hp.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 91b5ad875c53..22006f2d9dd5 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -742,7 +742,7 @@ 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);
         }
 
@@ -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");
 
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c
index f3c419256d2a..2e006ee5738b 100644
--- a/drivers/pci/hotplug/sgi_hotplug.c
+++ b/drivers/pci/hotplug/sgi_hotplug.c
@@ -535,7 +535,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);
                         }
                 }