Re: [PATCH v2] Fix a hard coding style when determining if a device is a container.

[Rafael J. Wysocki]

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@xxxxxxxxxxxxxx>
> Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@xxxxxxxxxxxxxx>

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:
> 
-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/