Skip to content

Commit

Permalink
ACPI / scan: Drop the second argument of acpi_device_unregister()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Jan 15, 2013
1 parent 6af9a80 commit b17b537
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/acpi/scan.c
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ static int acpi_device_register(struct acpi_device *device)
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)
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit b17b537

Please sign in to comment.