[PATCH 2/5] ACPI / scan: Drop the second argument of acpi_device_unregister()

From: Rafael J. Wysocki
Date: Mon Jan 14 2013 - 16:33:23 EST


From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

Drop the second argument of acpi_device_unregister(), type, which is
not used by that function.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
drivers/acpi/scan.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -776,7 +776,7 @@ int acpi_device_register(struct acpi_dev
return result;
}

-static void acpi_device_unregister(struct acpi_device *device, int type)
+static void acpi_device_unregister(struct acpi_device *device)
{
mutex_lock(&acpi_device_lock);
if (device->parent)
@@ -1436,7 +1436,7 @@ static int acpi_bus_remove(struct acpi_d
if (!rmdevice)
return 0;

- acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
+ acpi_device_unregister(dev);

return 0;
}
@@ -1750,7 +1750,7 @@ int __init acpi_scan_init(void)
result = acpi_bus_scan_fixed();

if (result)
- acpi_device_unregister(acpi_root, ACPI_BUS_REMOVAL_NORMAL);
+ acpi_device_unregister(acpi_root);
else
acpi_update_all_gpes();

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/