On Thu, Mar 23, 2017 at 09:46:12PM +0200, Andy Shevchenko wrote:
> By some reason acpi_find_gpio() and acpi_gpio_count() have compared connection
> ID to "gpios" when tries to check if suffix is needed or not.
>
> Don't do any assumptions about what connection ID can be and, when defined,
> use
> it only with suffix as it's done in the device tree version.
>
> Signed-off-by: Andy Shevchenko <andriy.shevche...@linux.intel.com>
Reviewed-by: Dmitry Torokhov <dmitry.torok...@gmail.com>
> ---
> drivers/gpio/gpiolib-acpi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
> index 56a6b1be3a17..3bda3166d418 100644
> --- a/drivers/gpio/gpiolib-acpi.c
> +++ b/drivers/gpio/gpiolib-acpi.c
> @@ -593,7 +593,7 @@ struct gpio_desc *acpi_find_gpio(struct device *dev,
>
> /* Try first from _DSD */
> for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
> - if (con_id && strcmp(con_id, "gpios")) {
> + if (con_id) {
> snprintf(propname, sizeof(propname), "%s-%s",
> con_id, gpio_suffixes[i]);
> } else {
> @@ -1081,7 +1081,7 @@ int acpi_gpio_count(struct device *dev, const char
> *con_id)
>
> /* Try first from _DSD */
> for (i = 0; i < ARRAY_SIZE(gpio_suffixes); i++) {
> - if (con_id && strcmp(con_id, "gpios"))
> + if (con_id)
> snprintf(propname, sizeof(propname), "%s-%s",
> con_id, gpio_suffixes[i]);
> else
> --
> 2.11.0
>
--
Dmitry
