AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ACPI: Fix a hard coding style when determining if a device is a container, v3

Browse Source 
"ACPI0004","PNP0A05" and "PNP0A06" are all defined in array
container_device_ids[], so use it, but not the hard coding style.

Also, introduce a new API is_container_device() to determine if a
device is a container device.

Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Reviewed-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Tang Chen 2012-10-26 13:38:16 +02:00 committed by Rafael J. Wysocki
parent 0a290ac425
commit 594df89a59
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/acpi/container.c
View File

@ -92,6 +92,19 @@ static int is_device_present(acpi_handle handle)
return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT); return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
} }
static bool is_container_device(const char *hid)
{
const struct acpi_device_id *container_id;
for (container_id = container_device_ids;
container_id->id[0]; container_id++) {
if (!strcmp((char *)container_id->id, hid))
return true;
}
return false;
}
/*******************************************************************/ /*******************************************************************/
static int acpi_container_add(struct acpi_device *device) static int acpi_container_add(struct acpi_device *device)
{ {
@ -232,10 +245,8 @@ container_walk_namespace_cb(acpi_handle handle,
goto end; goto end;
} }
if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") && if (!is_container_device(hid))
strcmp(hid, "PNP0A06")) {
goto end; goto end;
}
switch (*action) { switch (*action) {
case INSTALL_NOTIFY_HANDLER: case INSTALL_NOTIFY_HANDLER: