| Message ID | 1351059113-4660-1-git-send-email-tangchen@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Wed, Oct 24, 2012 at 12:11 AM, Tang Chen <tangchen@cn.fujitsu.com> wrote: > "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. > > change log v2 -> v3: > > 1. change the is_container_device()'s return value type from int to bool. No need to keep this level of detail in the permanent git changelogs. > 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> > --- > 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..69e2d6b 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 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) > { > @@ -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-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 1f9f7d7..69e2d6b 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 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) { @@ -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: