Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b17b537a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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



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

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarToshi Kani <toshi.kani@hp.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
Acked-by: default avatarYasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
parent 6af9a803

drivers/acpi/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -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)
@@ -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();