[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1350045098-7232-1-git-send-email-tangchen@cn.fujitsu.com>
Date: Fri, 12 Oct 2012 20:31:38 +0800
From: Tang Chen <tangchen@...fujitsu.com>
To: bhelgaas@...gle.com, lenb@...nel.org, yinghai@...nel.org,
jiang.liu@...wei.com, izumi.taku@...fujitsu.com,
isimatu.yasuaki@...fujitsu.com, linux-acpi@...r.kernel.org,
linux-pci@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Tang Chen <tangchen@...fujitsu.com>
Subject: [PATCH v2] Fix a hard coding style when determining if a device is a container.
"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@...fujitsu.com>
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@...fujitsu.com>
---
drivers/acpi/container.c | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c
index 1f9f7d7..ffd76ee 100644
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
@@ -92,6 +92,19 @@ static int is_device_present(acpi_handle handle)
return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT);
}
+static int 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 1;
+ }
+
+ return 0;
+}
+
/*******************************************************************/
static int acpi_container_add(struct acpi_device *device)
{
@@ -232,10 +245,8 @@ container_walk_namespace_cb(acpi_handle handle,
goto end;
}
- if (strcmp(hid, "ACPI0004") && strcmp(hid, "PNP0A05") &&
- strcmp(hid, "PNP0A06")) {
+ if (!is_container_device(hid))
goto end;
- }
switch (*action) {
case INSTALL_NOTIFY_HANDLER:
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists