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>

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 9e31b2bd93d3d2938d888b4e672364c733f16abc..4a56a8b2e51e488a5be8828a6c47e5c77eb64c65 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -339,7 +339,7 @@ static void dock_remove_acpi_device(acpi_handle handle)
        int ret;
 
        if (!acpi_bus_get_device(handle, &device)) {
-               ret = acpi_bus_trim(device, 1);
+               ret = acpi_bus_trim(device);
                if (ret)
                        pr_debug("error removing bus, %x\n", -ret);
        }

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a26c09efc28653ab6b756c3928b6c1853918f801..d14ce446b469486151a3b482a4eb43cf2a4cc953 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -133,7 +133,7 @@ void acpi_bus_hot_remove_device(void *context)
        ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                "Hot-removing device %s...\n", dev_name(&device->dev)));
 
-       if (acpi_bus_trim(device, 1)) {
+       if (acpi_bus_trim(device)) {
                printk(KERN_ERR PREFIX
                                "Removing device failed\n");
                goto err_out;
@@ -1374,7 +1374,7 @@ static int acpi_device_set_context(struct acpi_device *device)
        return -ENODEV;
 }
 
-static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
+static int acpi_bus_remove(struct acpi_device *dev)
 {
        if (!dev)
                return -EINVAL;
@@ -1382,9 +1382,6 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
        dev->removal_type = ACPI_BUS_REMOVAL_EJECT;
        device_release_driver(&dev->dev);
 
-       if (!rmdevice)
-               return 0;
-
        acpi_device_unregister(dev);
 
        return 0;
@@ -1642,7 +1639,7 @@ int acpi_bus_add(acpi_handle handle)
 }
 EXPORT_SYMBOL(acpi_bus_add);
 
-int acpi_bus_trim(struct acpi_device *start, int rmdevice)
+int acpi_bus_trim(struct acpi_device *start)
 {
        acpi_status status;
        struct acpi_device *parent, *child;
@@ -1668,12 +1665,7 @@ int acpi_bus_trim(struct acpi_device *start, int rmdevice)
                        acpi_get_parent(phandle, &phandle);
                        child = parent;
                        parent = parent->parent;
-
-                       if (level == 0)
-                               err = acpi_bus_remove(child, rmdevice);
-                       else
-                               err = acpi_bus_remove(child, 1);
-
+                       err = acpi_bus_remove(child);
                        continue;
                }
 

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 91b5ad875c53b4cdd5a52df136008ae469c76a27..22006f2d9dd5780e20734465587b7dabfb4a43bb 100644 (file)
--- 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 f3c419256d2a3f4736594a7103ea667df4232d94..2e006ee5738b556228431e130be1fa4b0f29f209 100644 (file)
--- 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);
                        }
                }
 

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index efe5f746c5610dbc08fa9da3fa1131ed29775d82..566f1fdabbd22a67ae4862220b8b644d3b217541 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -348,7 +348,7 @@ int acpi_bus_register_driver(struct acpi_driver *driver);
 void acpi_bus_unregister_driver(struct acpi_driver *driver);
 int acpi_bus_add(acpi_handle handle);
 void acpi_bus_hot_remove_device(void *context);
-int acpi_bus_trim(struct acpi_device *start, int rmdevice);
+int acpi_bus_trim(struct acpi_device *start);
 acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
 int acpi_match_device_ids(struct acpi_device *device,
                          const struct acpi_device_id *ids);