Patchwork [v2] Fix a hard coding style when determining if a device is a container.

login
register
mail settings
Submitter Tang Chen
Date Oct. 12, 2012, 12:31 p.m.
Message ID <1350045098-7232-1-git-send-email-tangchen@cn.fujitsu.com>
Download mbox | patch
Permalink /patch/191111/
State Superseded
Headers show

Comments

Tang Chen - Oct. 12, 2012, 12:31 p.m.
"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>
---
 drivers/acpi/container.c |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)
Tang Chen - Oct. 17, 2012, 3:26 a.m.
Hi,

Would anyone help to review this patch, and give some comments, please ?

Thanks. :)

On 10/12/2012 08:31 PM, 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.
>
> Signed-off-by: Tang Chen<tangchen@cn.fujitsu.com>
> Signed-off-by: Yasuaki Ishimatsu<isimatu.yasuaki@jp.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:

--
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
Tang Chen - Oct. 23, 2012, 12:05 p.m.
Hi,

Would somebody give some comments ?

Thanks. :)

On 10/12/2012 08:31 PM, 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.
>
> Signed-off-by: Tang Chen<tangchen@cn.fujitsu.com>
> Signed-off-by: Yasuaki Ishimatsu<isimatu.yasuaki@jp.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:

--
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
Bjorn Helgaas - Oct. 23, 2012, 4 p.m.
On Fri, Oct 12, 2012 at 6:31 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.
>
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Looks good to me, but is_container_device() should be of type "bool",
not type "int".

With that change,

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..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-pci" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rafael J. Wysocki - Oct. 24, 2012, 10:16 p.m.
On Friday 12 of October 2012 20:31:38 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.
> 
> Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>

Applied to linux-pm.git/acpi-next as v3.8 material.

Thanks,
Rafael


> ---
>  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:
>

Patch

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: