sugar/linux
1
0
Fork 0
Code Activity

ACPI: Change the ordering of acpi_bus_check_add()

Browse Source 
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 <rafael.j.wysocki@intel.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Toshi Kani <toshi.kani@hp.com>
This commit is contained in:
Rafael J. Wysocki
2012-12-21 00:36:44 +01:00
parent a2d06a1a08
commit 4002bf384c
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/acpi/scan.c
View File

@@ -1582,6 +1582,10 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
acpi_status status; acpi_status status;
int result; int result;
acpi_bus_get_device(handle, &device);
if (device)
goto out;
result = acpi_bus_type_and_status(handle, &type, &sta); result = acpi_bus_type_and_status(handle, &type, &sta);
if (result) if (result)
return AE_OK; return AE_OK;
@@ -1598,18 +1602,14 @@ static acpi_status acpi_bus_check_add(acpi_handle handle, u32 lvl,
return AE_CTRL_DEPTH; return AE_CTRL_DEPTH;
} }
acpi_bus_get_device(handle, &device); acpi_add_single_object(&device, handle, type, sta, ACPI_BUS_ADD_BASIC);
if (!device) { if (!device)
acpi_add_single_object(&device, handle, type, sta, return AE_CTRL_DEPTH;
ACPI_BUS_ADD_BASIC);
if (!device)
return AE_CTRL_DEPTH;
device->add_type = context ? device->add_type = context ? ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH;
ACPI_BUS_ADD_START : ACPI_BUS_ADD_MATCH; acpi_hot_add_bind(device);
acpi_hot_add_bind(device);
}
out:
if (!*return_value) if (!*return_value)
*return_value = device; *return_value = device;