ACPI / scan: Drop the second argument of acpi_device_unregister()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Jan 2013 12:23:44 +0000 (13:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 15 Jan 2013 12:23:44 +0000 (13:23 +0100)
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@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>
drivers/acpi/scan.c

index bac357da3f29283a7d9338eddc8637f64e1ea53a..a26c09efc28653ab6b756c3928b6c1853918f801 100644 (file)
@@ -701,7 +701,7 @@ end:
        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)
@@ -1385,7 +1385,7 @@ static int acpi_bus_remove(struct acpi_device *dev, int rmdevice)
        if (!rmdevice)
                return 0;
 
-       acpi_device_unregister(dev, ACPI_BUS_REMOVAL_EJECT);
+       acpi_device_unregister(dev);
 
        return 0;
 }
@@ -1746,7 +1746,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();