| Message ID | 20170309135957.15161-1-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Thu, 2017-03-09 at 14:59 +0100, Hans de Goede wrote: > The gpiolib-acpi code is becoming more strict and connection-IDs > may only be used with devices which have a _DSD with matching IDs > in there. Since the soc_button_array ACPI binding is pure index > based pass in NULL as connection-ID to avoid the more strict cheks > resulting in gpiod_count and gpiod_get_index not returning any gpios. > Fine by me: FWIW: Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/input/misc/soc_button_array.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/input/misc/soc_button_array.c > b/drivers/input/misc/soc_button_array.c > index eb1ba4e..b8769f6 100644 > --- a/drivers/input/misc/soc_button_array.c > +++ b/drivers/input/misc/soc_button_array.c > @@ -48,7 +48,7 @@ static int soc_button_lookup_gpio(struct device > *dev, int acpi_index) > struct gpio_desc *desc; > int gpio; > > - desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index, > GPIOD_ASIS); > + desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS); > if (IS_ERR(desc)) > return PTR_ERR(desc); > > @@ -167,7 +167,7 @@ static int soc_button_probe(struct platform_device > *pdev) > > button_info = (struct soc_button_info *)id->driver_data; > > - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { > + if (gpiod_count(dev, NULL) <= 0) { > dev_dbg(dev, "no GPIO attached, ignoring...\n"); > return -ENODEV; > }
On Thu, Mar 09, 2017 at 04:11:15PM +0200, Andy Shevchenko wrote: > On Thu, 2017-03-09 at 14:59 +0100, Hans de Goede wrote: > > The gpiolib-acpi code is becoming more strict and connection-IDs > > may only be used with devices which have a _DSD with matching IDs > > in there. Since the soc_button_array ACPI binding is pure index > > based pass in NULL as connection-ID to avoid the more strict cheks > > resulting in gpiod_count and gpiod_get_index not returning any gpios. > > > > Fine by me: > > FWIW: > Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Applied, thank you. > > > Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > --- > > drivers/input/misc/soc_button_array.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/input/misc/soc_button_array.c > > b/drivers/input/misc/soc_button_array.c > > index eb1ba4e..b8769f6 100644 > > --- a/drivers/input/misc/soc_button_array.c > > +++ b/drivers/input/misc/soc_button_array.c > > @@ -48,7 +48,7 @@ static int soc_button_lookup_gpio(struct device > > *dev, int acpi_index) > > struct gpio_desc *desc; > > int gpio; > > > > - desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index, > > GPIOD_ASIS); > > + desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS); > > if (IS_ERR(desc)) > > return PTR_ERR(desc); > > > > @@ -167,7 +167,7 @@ static int soc_button_probe(struct platform_device > > *pdev) > > > > button_info = (struct soc_button_info *)id->driver_data; > > > > - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { > > + if (gpiod_count(dev, NULL) <= 0) { > > dev_dbg(dev, "no GPIO attached, ignoring...\n"); > > return -ENODEV; > > } > > -- > Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Intel Finland Oy
diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index eb1ba4e..b8769f6 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -48,7 +48,7 @@ static int soc_button_lookup_gpio(struct device *dev, int acpi_index) struct gpio_desc *desc; int gpio; - desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index, GPIOD_ASIS); + desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS); if (IS_ERR(desc)) return PTR_ERR(desc); @@ -167,7 +167,7 @@ static int soc_button_probe(struct platform_device *pdev) button_info = (struct soc_button_info *)id->driver_data; - if (gpiod_count(dev, KBUILD_MODNAME) <= 0) { + if (gpiod_count(dev, NULL) <= 0) { dev_dbg(dev, "no GPIO attached, ignoring...\n"); return -ENODEV; }
The gpiolib-acpi code is becoming more strict and connection-IDs may only be used with devices which have a _DSD with matching IDs in there. Since the soc_button_array ACPI binding is pure index based pass in NULL as connection-ID to avoid the more strict cheks resulting in gpiod_count and gpiod_get_index not returning any gpios. Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/input/misc/soc_button_array.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)