From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758810Ab2JXVEP (ORCPT ); Wed, 24 Oct 2012 17:04:15 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:56755 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751447Ab2JXVEN (ORCPT ); Wed, 24 Oct 2012 17:04:13 -0400 MIME-Version: 1.0 In-Reply-To: <1351059113-4660-1-git-send-email-tangchen@cn.fujitsu.com> References: <1351059113-4660-1-git-send-email-tangchen@cn.fujitsu.com> From: Bjorn Helgaas Date: Wed, 24 Oct 2012 15:03:52 -0600 Message-ID: Subject: Re: [PATCH v3] Fix a hard coding style when determining if a device is a container. To: Tang Chen Cc: yinghai@kernel.org, lenb@kernel.org, jiang.liu@huawei.com, izumi.taku@jp.fujitsu.com, isimatu.yasuaki@jp.fujitsu.com, linux-acpi@vger.kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset=ISO-8859-1 X-System-Of-Record: true Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 24, 2012 at 12:11 AM, Tang Chen 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 > Signed-off-by: Yasuaki Ishimatsu Reviewed-by: Bjorn Helgaas > --- > 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 >