[PATCH rev.2 6/6] ACPI: Change the ordering of acpi_bus_check_add()
From: Rafael J. Wysocki <hidden>
Date: 2012-12-13 22:18:33
Also in:
linux-pci, lkml
From: Rafael J. Wysocki <redacted> If acpi_bus_check_add() is called for a handle already having an existing struct acpi_device object attached, it is not necessary to check the type and status of the device correspondig to it, so change the ordering of acpi_bus_check_add() to avoid that. Signed-off-by: Rafael J. Wysocki <redacted> --- drivers/acpi/scan.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) Index: linux/drivers/acpi/scan.c ===================================================================
--- linux.orig/drivers/acpi/scan.c
+++ linux/drivers/acpi/scan.c@@ -1582,6 +1582,10 @@ static acpi_status acpi_bus_check_add(ac acpi_status status; int result; + acpi_bus_get_device(handle, &device); + if (device) + goto out; + result = acpi_bus_type_and_status(handle, &type, &sta); if (result) return AE_OK;
@@ -1598,17 +1602,13 @@ static acpi_status acpi_bus_check_add(ac return AE_CTRL_DEPTH; } - acpi_bus_get_device(handle, &device); - if (!device) { - acpi_add_single_object(&device, handle, type, sta, - ACPI_BUS_ADD_BASIC); - if (!device) - return AE_CTRL_DEPTH; + acpi_add_single_object(&device, handle, type, sta, ACPI_BUS_ADD_BASIC); + if (!device) + return AE_CTRL_DEPTH; - device->add_type = context ? - ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH; - } + device->add_type = context ? ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH; + out: if (!*return_value) *return_value = device;