| Message ID | 1380639537-23406-3-git-send-email-mika.westerberg@linux.intel.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Tue, Oct 1, 2013 at 7:58 AM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > The new GPIO descriptor based interface is now preferred over the old > integer based one. This patch converts the ACPI GPIO helpers to use this > new interface internally. In addition to that provide compatibility > functions acpi_get_gpio() and acpi_get_gpio_by_index() that convert the > returned GPIO descriptors to integers. > > Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> > --- > drivers/gpio/gpiolib-acpi.c | 51 +++++++++++++++++++++------------------------ > include/linux/acpi_gpio.h | 38 ++++++++++++++++++++++++++------- > 2 files changed, 54 insertions(+), 35 deletions(-) > > diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c > index 1745ce5..333297c 100644 > --- a/drivers/gpio/gpiolib-acpi.c > +++ b/drivers/gpio/gpiolib-acpi.c > @@ -11,7 +11,7 @@ > */ > > #include <linux/errno.h> > -#include <linux/gpio.h> > +#include <linux/gpio/consumer.h> > #include <linux/export.h> > #include <linux/acpi_gpio.h> > #include <linux/acpi.h> > @@ -33,14 +33,15 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) > } > > /** > - * acpi_get_gpio() - Translate ACPI GPIO pin to GPIO number usable with GPIO API > + * acpi_get_gpiod() - Translate ACPI GPIO pin to GPIO descriptor usable with GPIO API > * @path: ACPI GPIO controller full path name, (e.g. "\\_SB.GPO1") > * @pin: ACPI GPIO pin number (0-based, controller-relative) > * > - * Returns GPIO number to use with Linux generic GPIO API, or errno error value > + * Returns GPIO descriptor to use with Linux generic GPIO API, or ERR_PTR > + * error value > */ > > -int acpi_get_gpio(char *path, int pin) > +struct gpio_desc *acpi_get_gpiod(char *path, int pin) > { > struct gpio_chip *chip; > acpi_handle handle; > @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) > > status = acpi_get_handle(NULL, path, &handle); > if (ACPI_FAILURE(status)) > - return -ENODEV; > + return ERR_PTR(-ENODEV); > > chip = gpiochip_find(handle, acpi_gpiochip_find); > if (!chip) > - return -ENODEV; > + return ERR_PTR(-ENODEV); > > - if (!gpio_is_valid(chip->base + pin)) > - return -EINVAL; > - > - return chip->base + pin; > + return gpio_to_desc(chip->base + pin); I think you want to avoid using gpio_to_desc(). It is just a convenience function provided to ease the transition for consumers that still need to rely on GPIO numbers for some reason. The same applies to desc_to_gpio(), although the usage you are making of it (implemented fallbacks for the integer space) is the one that is intended. The last line could be changed to "return &chip->desc[pin];" after checking that 0 <= pin <= chip->ngpio. This minor issue apart, I really like the fact you are moving this under the gpiolib APIs (also appreciate the testing of the new API this patchset provides!). I also wonder whether you could also avoid exporting acpi_get_gpiod* (which allow GPIO consumers to shortcut gpiolib) by implementing acpi_get_gpio* into the C file (maybe even using gpiod_get()). I see a "char *path" parameter though, so maybe that would not be possible at the moment. Once the gpio_to_desc() issue mentioned above is fixed I think I can give my Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> on patches 2-5. Thanks, Alex. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Oct 07, 2013 at 09:54:13PM -0700, Alexandre Courbot wrote: > > +struct gpio_desc *acpi_get_gpiod(char *path, int pin) > > { > > struct gpio_chip *chip; > > acpi_handle handle; > > @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) > > > > status = acpi_get_handle(NULL, path, &handle); > > if (ACPI_FAILURE(status)) > > - return -ENODEV; > > + return ERR_PTR(-ENODEV); > > > > chip = gpiochip_find(handle, acpi_gpiochip_find); > > if (!chip) > > - return -ENODEV; > > + return ERR_PTR(-ENODEV); > > > > - if (!gpio_is_valid(chip->base + pin)) > > - return -EINVAL; > > - > > - return chip->base + pin; > > + return gpio_to_desc(chip->base + pin); > > I think you want to avoid using gpio_to_desc(). It is just a > convenience function provided to ease the transition for consumers > that still need to rely on GPIO numbers for some reason. The same > applies to desc_to_gpio(), although the usage you are making of it > (implemented fallbacks for the integer space) is the one that is > intended. > > The last line could be changed to "return &chip->desc[pin];" after > checking that 0 <= pin <= chip->ngpio. I tried that but it doesn't compile anymore :-( drivers/gpio/gpiolib-acpi.c: In function ‘acpi_get_gpiod’: drivers/gpio/gpiolib-acpi.c:61:2: error: invalid use of undefined type ‘struct gpio_desc’ drivers/gpio/gpiolib-acpi.c:61:20: error: dereferencing pointer to incomplete type Since struct gpio_desc is internal to gpiolib.c we can't dereference it outside. The DT version also uses gpio_to_desc(). > This minor issue apart, I really like the fact you are moving this > under the gpiolib APIs (also appreciate the testing of the new API > this patchset provides!). > > I also wonder whether you could also avoid exporting acpi_get_gpiod* > (which allow GPIO consumers to shortcut gpiolib) by implementing > acpi_get_gpio* into the C file (maybe even using gpiod_get()). I see a > "char *path" parameter though, so maybe that would not be possible at > the moment. Good point, I'll check if we can do that. > Once the gpio_to_desc() issue mentioned above is fixed I think I can give my > > Reviewed-by: Alexandre Courbot <acourbot@nvidia.com> Thanks! > > on patches 2-5. > > Thanks, > Alex. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 08, 2013 at 11:45:08AM +0300, Mika Westerberg wrote: > > I also wonder whether you could also avoid exporting acpi_get_gpiod* > > (which allow GPIO consumers to shortcut gpiolib) by implementing > > acpi_get_gpio* into the C file (maybe even using gpiod_get()). I see a > > "char *path" parameter though, so maybe that would not be possible at > > the moment. > > Good point, I'll check if we can do that. Looks like we can get rid of acpi_get_gpio() and acpi_get_gpiod() as there are no users for those outside gpiolib-acpi. I'm going to do that in the next revision. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 8, 2013 at 1:45 AM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > On Mon, Oct 07, 2013 at 09:54:13PM -0700, Alexandre Courbot wrote: >> > +struct gpio_desc *acpi_get_gpiod(char *path, int pin) >> > { >> > struct gpio_chip *chip; >> > acpi_handle handle; >> > @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) >> > >> > status = acpi_get_handle(NULL, path, &handle); >> > if (ACPI_FAILURE(status)) >> > - return -ENODEV; >> > + return ERR_PTR(-ENODEV); >> > >> > chip = gpiochip_find(handle, acpi_gpiochip_find); >> > if (!chip) >> > - return -ENODEV; >> > + return ERR_PTR(-ENODEV); >> > >> > - if (!gpio_is_valid(chip->base + pin)) >> > - return -EINVAL; >> > - >> > - return chip->base + pin; >> > + return gpio_to_desc(chip->base + pin); >> >> I think you want to avoid using gpio_to_desc(). It is just a >> convenience function provided to ease the transition for consumers >> that still need to rely on GPIO numbers for some reason. The same >> applies to desc_to_gpio(), although the usage you are making of it >> (implemented fallbacks for the integer space) is the one that is >> intended. >> >> The last line could be changed to "return &chip->desc[pin];" after >> checking that 0 <= pin <= chip->ngpio. > > I tried that but it doesn't compile anymore :-( > > drivers/gpio/gpiolib-acpi.c: In function ‘acpi_get_gpiod’: > drivers/gpio/gpiolib-acpi.c:61:2: error: invalid use of undefined type ‘struct gpio_desc’ > drivers/gpio/gpiolib-acpi.c:61:20: error: dereferencing pointer to incomplete type Ah right, there is no way to know the size of a gpio_desc from here... Maybe I should make a gpiochip_get_desc(index) function accessible to drivers only that takes care of this. Another possibility would be to move this function into gpiolib.c but there are probably too many dependencies with ACPI for that. In the long term I would like to see gpio_to_desc()/desc_to_gpio() disappear from the consumer interface as they allow unsafe use of GPIO descriptors. > The DT version also uses gpio_to_desc(). That seems to speak in favor of that gpiochip_get_desc() function I talked about earlier. Thanks, Alex. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 8, 2013 at 3:36 AM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > On Tue, Oct 08, 2013 at 11:45:08AM +0300, Mika Westerberg wrote: >> > I also wonder whether you could also avoid exporting acpi_get_gpiod* >> > (which allow GPIO consumers to shortcut gpiolib) by implementing >> > acpi_get_gpio* into the C file (maybe even using gpiod_get()). I see a >> > "char *path" parameter though, so maybe that would not be possible at >> > the moment. >> >> Good point, I'll check if we can do that. > > Looks like we can get rid of acpi_get_gpio() and acpi_get_gpiod() as there > are no users for those outside gpiolib-acpi. I'm going to do that in the > next revision. That's good news. If you can make it such that ACPI GPIO consumers don't need to include acpi_gpio.h anymore, then this would make my day. :) Alex. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 08, 2013 at 09:24:50AM -0700, Alexandre Courbot wrote: > On Tue, Oct 8, 2013 at 1:45 AM, Mika Westerberg > <mika.westerberg@linux.intel.com> wrote: > > On Mon, Oct 07, 2013 at 09:54:13PM -0700, Alexandre Courbot wrote: > >> > +struct gpio_desc *acpi_get_gpiod(char *path, int pin) > >> > { > >> > struct gpio_chip *chip; > >> > acpi_handle handle; > >> > @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) > >> > > >> > status = acpi_get_handle(NULL, path, &handle); > >> > if (ACPI_FAILURE(status)) > >> > - return -ENODEV; > >> > + return ERR_PTR(-ENODEV); > >> > > >> > chip = gpiochip_find(handle, acpi_gpiochip_find); > >> > if (!chip) > >> > - return -ENODEV; > >> > + return ERR_PTR(-ENODEV); > >> > > >> > - if (!gpio_is_valid(chip->base + pin)) > >> > - return -EINVAL; > >> > - > >> > - return chip->base + pin; > >> > + return gpio_to_desc(chip->base + pin); > >> > >> I think you want to avoid using gpio_to_desc(). It is just a > >> convenience function provided to ease the transition for consumers > >> that still need to rely on GPIO numbers for some reason. The same > >> applies to desc_to_gpio(), although the usage you are making of it > >> (implemented fallbacks for the integer space) is the one that is > >> intended. > >> > >> The last line could be changed to "return &chip->desc[pin];" after > >> checking that 0 <= pin <= chip->ngpio. > > > > I tried that but it doesn't compile anymore :-( > > > > drivers/gpio/gpiolib-acpi.c: In function ‘acpi_get_gpiod’: > > drivers/gpio/gpiolib-acpi.c:61:2: error: invalid use of undefined type ‘struct gpio_desc’ > > drivers/gpio/gpiolib-acpi.c:61:20: error: dereferencing pointer to incomplete type > > Ah right, there is no way to know the size of a gpio_desc from here... > Maybe I should make a gpiochip_get_desc(index) function accessible to > drivers only that takes care of this. Another possibility would be to > move this function into gpiolib.c but there are probably too many > dependencies with ACPI for that. > > In the long term I would like to see gpio_to_desc()/desc_to_gpio() > disappear from the consumer interface as they allow unsafe use of GPIO > descriptors. > > > The DT version also uses gpio_to_desc(). > > That seems to speak in favor of that gpiochip_get_desc() function I > talked about earlier. OK, I can convert the ACPI code to use that once such function exists. I the meanwhile, can I use gpio_to_desc() in the next revision of the patches? -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Oct 08, 2013 at 09:26:14AM -0700, Alexandre Courbot wrote: > On Tue, Oct 8, 2013 at 3:36 AM, Mika Westerberg > <mika.westerberg@linux.intel.com> wrote: > > On Tue, Oct 08, 2013 at 11:45:08AM +0300, Mika Westerberg wrote: > >> > I also wonder whether you could also avoid exporting acpi_get_gpiod* > >> > (which allow GPIO consumers to shortcut gpiolib) by implementing > >> > acpi_get_gpio* into the C file (maybe even using gpiod_get()). I see a > >> > "char *path" parameter though, so maybe that would not be possible at > >> > the moment. > >> > >> Good point, I'll check if we can do that. > > > > Looks like we can get rid of acpi_get_gpio() and acpi_get_gpiod() as there > > are no users for those outside gpiolib-acpi. I'm going to do that in the > > next revision. > > That's good news. If you can make it such that ACPI GPIO consumers > don't need to include acpi_gpio.h anymore, then this would make my > day. :) We can get rid of the whole apci_gpio.h eventually. But before doing that I would like to have something that supports both the ACPI way and gpiod way in v3.13 if possible. Once we have gpiod_get_index() in mainline, we can convert the existing user to it and drop acpi_gpio.h completely. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 9, 2013 at 12:58 AM, Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > On Tue, Oct 08, 2013 at 09:24:50AM -0700, Alexandre Courbot wrote: >> On Tue, Oct 8, 2013 at 1:45 AM, Mika Westerberg >> <mika.westerberg@linux.intel.com> wrote: >> > On Mon, Oct 07, 2013 at 09:54:13PM -0700, Alexandre Courbot wrote: >> >> > +struct gpio_desc *acpi_get_gpiod(char *path, int pin) >> >> > { >> >> > struct gpio_chip *chip; >> >> > acpi_handle handle; >> >> > @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) >> >> > >> >> > status = acpi_get_handle(NULL, path, &handle); >> >> > if (ACPI_FAILURE(status)) >> >> > - return -ENODEV; >> >> > + return ERR_PTR(-ENODEV); >> >> > >> >> > chip = gpiochip_find(handle, acpi_gpiochip_find); >> >> > if (!chip) >> >> > - return -ENODEV; >> >> > + return ERR_PTR(-ENODEV); >> >> > >> >> > - if (!gpio_is_valid(chip->base + pin)) >> >> > - return -EINVAL; >> >> > - >> >> > - return chip->base + pin; >> >> > + return gpio_to_desc(chip->base + pin); >> >> >> >> I think you want to avoid using gpio_to_desc(). It is just a >> >> convenience function provided to ease the transition for consumers >> >> that still need to rely on GPIO numbers for some reason. The same >> >> applies to desc_to_gpio(), although the usage you are making of it >> >> (implemented fallbacks for the integer space) is the one that is >> >> intended. >> >> >> >> The last line could be changed to "return &chip->desc[pin];" after >> >> checking that 0 <= pin <= chip->ngpio. >> > >> > I tried that but it doesn't compile anymore :-( >> > >> > drivers/gpio/gpiolib-acpi.c: In function ‘acpi_get_gpiod’: >> > drivers/gpio/gpiolib-acpi.c:61:2: error: invalid use of undefined type ‘struct gpio_desc’ >> > drivers/gpio/gpiolib-acpi.c:61:20: error: dereferencing pointer to incomplete type >> >> Ah right, there is no way to know the size of a gpio_desc from here... >> Maybe I should make a gpiochip_get_desc(index) function accessible to >> drivers only that takes care of this. Another possibility would be to >> move this function into gpiolib.c but there are probably too many >> dependencies with ACPI for that. >> >> In the long term I would like to see gpio_to_desc()/desc_to_gpio() >> disappear from the consumer interface as they allow unsafe use of GPIO >> descriptors. >> >> > The DT version also uses gpio_to_desc(). >> >> That seems to speak in favor of that gpiochip_get_desc() function I >> talked about earlier. > > OK, I can convert the ACPI code to use that once such function exists. I > the meanwhile, can I use gpio_to_desc() in the next revision of the > patches? Sure, please do so - anyway that's the only way you have at the moment. I will add gpiochip_get_desc() to v2 of gpiod and we'll convert your code either before or after it is merged, depending on our timing. -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 1745ce5..333297c 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -11,7 +11,7 @@ */ #include <linux/errno.h> -#include <linux/gpio.h> +#include <linux/gpio/consumer.h> #include <linux/export.h> #include <linux/acpi_gpio.h> #include <linux/acpi.h> @@ -33,14 +33,15 @@ static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) } /** - * acpi_get_gpio() - Translate ACPI GPIO pin to GPIO number usable with GPIO API + * acpi_get_gpiod() - Translate ACPI GPIO pin to GPIO descriptor usable with GPIO API * @path: ACPI GPIO controller full path name, (e.g. "\\_SB.GPO1") * @pin: ACPI GPIO pin number (0-based, controller-relative) * - * Returns GPIO number to use with Linux generic GPIO API, or errno error value + * Returns GPIO descriptor to use with Linux generic GPIO API, or ERR_PTR + * error value */ -int acpi_get_gpio(char *path, int pin) +struct gpio_desc *acpi_get_gpiod(char *path, int pin) { struct gpio_chip *chip; acpi_handle handle; @@ -48,18 +49,15 @@ int acpi_get_gpio(char *path, int pin) status = acpi_get_handle(NULL, path, &handle); if (ACPI_FAILURE(status)) - return -ENODEV; + return ERR_PTR(-ENODEV); chip = gpiochip_find(handle, acpi_gpiochip_find); if (!chip) - return -ENODEV; + return ERR_PTR(-ENODEV); - if (!gpio_is_valid(chip->base + pin)) - return -EINVAL; - - return chip->base + pin; + return gpio_to_desc(chip->base + pin); } -EXPORT_SYMBOL_GPL(acpi_get_gpio); +EXPORT_SYMBOL_GPL(acpi_get_gpiod); static irqreturn_t acpi_gpio_irq_handler(int irq, void *data) { @@ -235,7 +233,7 @@ EXPORT_SYMBOL(acpi_gpiochip_free_interrupts); struct acpi_gpio_lookup { struct acpi_gpio_info info; int index; - int gpio; + struct gpio_desc *desc; int n; }; @@ -246,11 +244,11 @@ static int acpi_find_gpio(struct acpi_resource *ares, void *data) if (ares->type != ACPI_RESOURCE_TYPE_GPIO) return 1; - if (lookup->n++ == lookup->index && lookup->gpio < 0) { + if (lookup->n++ == lookup->index && !lookup->desc) { const struct acpi_resource_gpio *agpio = &ares->data.gpio; - lookup->gpio = acpi_get_gpio(agpio->resource_source.string_ptr, - agpio->pin_table[0]); + lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr, + agpio->pin_table[0]); lookup->info.gpioint = agpio->connection_type == ACPI_RESOURCE_GPIO_TYPE_INT; } @@ -259,24 +257,24 @@ static int acpi_find_gpio(struct acpi_resource *ares, void *data) } /** - * acpi_get_gpio_by_index() - get a GPIO number from device resources + * acpi_get_gpiod_by_index() - get a GPIO descriptor from device resources * @dev: pointer to a device to get GPIO from * @index: index of GpioIo/GpioInt resource (starting from %0) * @info: info pointer to fill in (optional) * * Function goes through ACPI resources for @dev and based on @index looks - * up a GpioIo/GpioInt resource, translates it to the Linux GPIO number, + * up a GpioIo/GpioInt resource, translates it to the Linux GPIO descriptor, * and returns it. @index matches GpioIo/GpioInt resources only so if there * are total %3 GPIO resources, the index goes from %0 to %2. * - * If the GPIO cannot be translated or there is an error, negative errno is + * If the GPIO cannot be translated or there is an error an ERR_PTR is * returned. * * Note: if the GPIO resource has multiple entries in the pin list, this * function only returns the first. */ -int acpi_get_gpio_by_index(struct device *dev, int index, - struct acpi_gpio_info *info) +struct gpio_desc *acpi_get_gpiod_by_index(struct device *dev, int index, + struct acpi_gpio_info *info) { struct acpi_gpio_lookup lookup; struct list_head resource_list; @@ -285,27 +283,26 @@ int acpi_get_gpio_by_index(struct device *dev, int index, int ret; if (!dev) - return -EINVAL; + return ERR_PTR(-EINVAL); handle = ACPI_HANDLE(dev); if (!handle || acpi_bus_get_device(handle, &adev)) - return -ENODEV; + return ERR_PTR(-ENODEV); memset(&lookup, 0, sizeof(lookup)); lookup.index = index; - lookup.gpio = -ENODEV; INIT_LIST_HEAD(&resource_list); ret = acpi_dev_get_resources(adev, &resource_list, acpi_find_gpio, &lookup); if (ret < 0) - return ret; + return ERR_PTR(ret); acpi_dev_free_resource_list(&resource_list); - if (lookup.gpio >= 0 && info) + if (lookup.desc && info) *info = lookup.info; - return lookup.gpio; + return lookup.desc ? lookup.desc : ERR_PTR(-ENODEV); } -EXPORT_SYMBOL_GPL(acpi_get_gpio_by_index); +EXPORT_SYMBOL_GPL(acpi_get_gpiod_by_index); diff --git a/include/linux/acpi_gpio.h b/include/linux/acpi_gpio.h index 4c120a1..bbfa83a 100644 --- a/include/linux/acpi_gpio.h +++ b/include/linux/acpi_gpio.h @@ -2,8 +2,10 @@ #define _LINUX_ACPI_GPIO_H_ #include <linux/device.h> +#include <linux/err.h> #include <linux/errno.h> #include <linux/gpio.h> +#include <linux/gpio/consumer.h> /** * struct acpi_gpio_info - ACPI GPIO specific information @@ -15,23 +17,24 @@ struct acpi_gpio_info { #ifdef CONFIG_GPIO_ACPI -int acpi_get_gpio(char *path, int pin); -int acpi_get_gpio_by_index(struct device *dev, int index, - struct acpi_gpio_info *info); +struct gpio_desc *acpi_get_gpiod(char *path, int pin); +struct gpio_desc *acpi_get_gpiod_by_index(struct device *dev, int index, + struct acpi_gpio_info *info); void acpi_gpiochip_request_interrupts(struct gpio_chip *chip); void acpi_gpiochip_free_interrupts(struct gpio_chip *chip); #else /* CONFIG_GPIO_ACPI */ -static inline int acpi_get_gpio(char *path, int pin) +static inline struct gpio_desc *acpi_get_gpiod(char *path, int pin) { - return -ENODEV; + return ERR_PTR(-ENOSYS); } -static inline int acpi_get_gpio_by_index(struct device *dev, int index, - struct acpi_gpio_info *info) +static inline struct gpio_desc * +acpi_get_gpiod_by_index(struct device *dev, int index, + struct acpi_gpio_info *info) { - return -ENODEV; + return ERR_PTR(-ENOSYS); } static inline void acpi_gpiochip_request_interrupts(struct gpio_chip *chip) { } @@ -39,4 +42,23 @@ static inline void acpi_gpiochip_free_interrupts(struct gpio_chip *chip) { } #endif /* CONFIG_GPIO_ACPI */ +static inline int acpi_get_gpio(char *path, int pin) +{ + struct gpio_desc *desc = acpi_get_gpiod(path, pin); + + if (IS_ERR(desc)) + return PTR_ERR(desc); + return desc_to_gpio(desc); +} + +static inline int acpi_get_gpio_by_index(struct device *dev, int index, + struct acpi_gpio_info *info) +{ + struct gpio_desc *desc = acpi_get_gpiod_by_index(dev, index, info); + + if (IS_ERR(desc)) + return PTR_ERR(desc); + return desc_to_gpio(desc); +} + #endif /* _LINUX_ACPI_GPIO_H_ */
The new GPIO descriptor based interface is now preferred over the old integer based one. This patch converts the ACPI GPIO helpers to use this new interface internally. In addition to that provide compatibility functions acpi_get_gpio() and acpi_get_gpio_by_index() that convert the returned GPIO descriptors to integers. Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> --- drivers/gpio/gpiolib-acpi.c | 51 +++++++++++++++++++++------------------------ include/linux/acpi_gpio.h | 38 ++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 35 deletions(-)