[v2] gpio: acpi: Ignore -EPROBE_DEFER for unselected gpioints

Submitted by Hans de Goede on March 13, 2017, 10:04 p.m.

Details

Message ID 20170313220421.27314-1-hdegoede@redhat.com
State New
Headers show

Commit Message

Hans de Goede March 13, 2017, 10:04 p.m.
When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.

This allows drivers which request a gpioint with index > 0 to function
if there is no gpiochip driver (loaded) for gpioints with a lower index.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/gpio/gpiolib-acpi.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

Comments

Hans de Goede March 13, 2017, 10:06 p.m.
Hi,

A note about the v2 in the subject, this patch moving from me to
Andy and back again has resulted in the inline changelog being
eaten.

This is basically a new patch replacing my 2 patch series
which tried to deal with -EPROBE_DEFER errors for not
selected gpioints. It uses a different (simpler) approach
then that series.

Regards,

Hans

On 13-03-17 23:04, Hans de Goede wrote:
> When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
> not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.
>
> This allows drivers which request a gpioint with index > 0 to function
> if there is no gpiochip driver (loaded) for gpioints with a lower index.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  drivers/gpio/gpiolib-acpi.c | 18 +++++++++++-------
>  1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
> index 9b37a36..8cd3f66 100644
> --- a/drivers/gpio/gpiolib-acpi.c
> +++ b/drivers/gpio/gpiolib-acpi.c
> @@ -653,20 +653,24 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
>  {
>  	int idx, i;
>  	unsigned int irq_flags;
> -	int ret = -ENOENT;
>
>  	for (i = 0, idx = 0; idx <= index; i++) {
>  		struct acpi_gpio_info info;
>  		struct gpio_desc *desc;
>
>  		desc = acpi_get_gpiod_by_index(adev, NULL, i, &info);
> -		if (IS_ERR(desc)) {
> -			ret = PTR_ERR(desc);
> -			break;
> -		}
> +
> +		/* Ignore -EPROBE_DEFER, it only matters if idx matches */
> +		if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
> +			return PTR_ERR(desc);
> +
>  		if (info.gpioint && idx++ == index) {
> -			int irq = gpiod_to_irq(desc);
> +			int irq;
> +
> +			if (IS_ERR(desc))
> +				return PTR_ERR(desc);
>
> +			irq = gpiod_to_irq(desc);
>  			if (irq < 0)
>  				return irq;
>
> @@ -682,7 +686,7 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
>  		}
>
>  	}
> -	return ret;
> +	return -ENOENT;
>  }
>  EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get);
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij March 15, 2017, 10:31 a.m.
On Mon, Mar 13, 2017 at 11:04 PM, Hans de Goede <hdegoede@redhat.com> wrote:

> When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
> not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.
>
> This allows drivers which request a gpioint with index > 0 to function
> if there is no gpiochip driver (loaded) for gpioints with a lower index.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

I am dependent on Mika and Rafael to review ACPI/GPIO patches,
maybe I should just put in a special entry to MAINTAINERS for
this file... anyway let's see what they say.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mika Westerberg March 15, 2017, 10:54 a.m.
On Wed, Mar 15, 2017 at 11:31:36AM +0100, Linus Walleij wrote:
> On Mon, Mar 13, 2017 at 11:04 PM, Hans de Goede <hdegoede@redhat.com> wrote:
> 
> > When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
> > not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.
> >
> > This allows drivers which request a gpioint with index > 0 to function
> > if there is no gpiochip driver (loaded) for gpioints with a lower index.
> >
> > Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> I am dependent on Mika and Rafael to review ACPI/GPIO patches,
> maybe I should just put in a special entry to MAINTAINERS for
> this file... anyway let's see what they say.

Hans, could you in future Cc patches related to ACPI to linux-acpi
mailing list as well? This one I looked up from linux-gpio mail
archives.

The patch looks good to me so,

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Hans de Goede March 15, 2017, 1:35 p.m.
Hi,

On 15-03-17 11:54, Mika Westerberg wrote:
> On Wed, Mar 15, 2017 at 11:31:36AM +0100, Linus Walleij wrote:
>> On Mon, Mar 13, 2017 at 11:04 PM, Hans de Goede <hdegoede@redhat.com> wrote:
>>
>>> When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
>>> not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.
>>>
>>> This allows drivers which request a gpioint with index > 0 to function
>>> if there is no gpiochip driver (loaded) for gpioints with a lower index.
>>>
>>> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
>>> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
>>
>> I am dependent on Mika and Rafael to review ACPI/GPIO patches,
>> maybe I should just put in a special entry to MAINTAINERS for
>> this file... anyway let's see what they say.
>
> Hans, could you in future Cc patches related to ACPI to linux-acpi
> mailing list as well?

Ok, will do.

> This one I looked up from linux-gpio mail
> archives.
>
> The patch looks good to me so,
>
> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Thank you.

Regards,

Hans
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Linus Walleij March 16, 2017, 2:48 p.m.
On Mon, Mar 13, 2017 at 11:04 PM, Hans de Goede <hdegoede@redhat.com> wrote:

> When acpi_dev_gpio_irq_get gets called with an index of say 2, it should
> not care if acpi_get_gpiod for index 0 or 1 returns -EPROBE_DEFER.
>
> This allows drivers which request a gpioint with index > 0 to function
> if there is no gpiochip driver (loaded) for gpioints with a lower index.
>
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Patch applied with Mika's ACK.

Yours,
Linus Walleij
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch hide | download patch | download mbox

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 9b37a36..8cd3f66 100644
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -653,20 +653,24 @@  int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
 {
 	int idx, i;
 	unsigned int irq_flags;
-	int ret = -ENOENT;
 
 	for (i = 0, idx = 0; idx <= index; i++) {
 		struct acpi_gpio_info info;
 		struct gpio_desc *desc;
 
 		desc = acpi_get_gpiod_by_index(adev, NULL, i, &info);
-		if (IS_ERR(desc)) {
-			ret = PTR_ERR(desc);
-			break;
-		}
+
+		/* Ignore -EPROBE_DEFER, it only matters if idx matches */
+		if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
+			return PTR_ERR(desc);
+
 		if (info.gpioint && idx++ == index) {
-			int irq = gpiod_to_irq(desc);
+			int irq;
+
+			if (IS_ERR(desc))
+				return PTR_ERR(desc);
 
+			irq = gpiod_to_irq(desc);
 			if (irq < 0)
 				return irq;
 
@@ -682,7 +686,7 @@  int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
 		}
 
 	}
-	return ret;
+	return -ENOENT;
 }
 EXPORT_SYMBOL_GPL(acpi_dev_gpio_irq_get);