Currently gpiod_to_offset() is a gpio-subsystem private function which is used by the gpiolib itself and by the aspeed gpio driver. The time has shown that there are other drivers as well which need this information in some special cases e.g. MFD drivers. The patch makes the function public but you need to explicit add the <linux/gpio/private.h> include. See discussion [1] for more information. [1] https://lkml.org/lkml/2019/11/27/357 Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> --- v3: - former patch description was "gpio: add support to get local gpio number" - adapt commit message and description to reflect new state - don't add wrapper instead use the already existing gpiod_to_offset - move gpiod_to_offset from gpiolib.h into gpiolib.c - move declaration into linux/gpio/private.h --- drivers/gpio/gpio-aspeed.c | 11 +++++------ drivers/gpio/gpiolib-sysfs.c | 1 + drivers/gpio/gpiolib.c | 22 ++++++++++++++++++++++ drivers/gpio/gpiolib.h | 8 -------- include/linux/gpio/private.h | 27 +++++++++++++++++++++++++++ 5 files changed, 55 insertions(+), 14 deletions(-) create mode 100644 include/linux/gpio/private.h diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c index b1d1d39e5174..e10ebad6853a 100644 --- a/drivers/gpio/gpio-aspeed.c +++ b/drivers/gpio/gpio-aspeed.c @@ -20,13 +20,12 @@ #include <linux/string.h> /* - * These two headers aren't meant to be used by GPIO drivers. We need - * them in order to access gpiod_to_offset() which we need to implement - * the aspeed specific API which allows the coprocessor to request - * access to some GPIOs and to arbitrate between coprocessor and ARM. + * The header isn't meant to be used by GPIO drivers. We need it in order to + * access gpiod_to_offset() which we need to implement the aspeed specific API + * which allows the coprocessor to request access to some GPIOs and to + * arbitrate between coprocessor and ARM. */ -#include <linux/gpio/consumer.h> -#include "gpiolib.h" +#include <linux/gpio/private.h> struct aspeed_bank_props { unsigned int bank; diff --git a/drivers/gpio/gpiolib-sysfs.c b/drivers/gpio/gpiolib-sysfs.c index d4cab6a80928..367db78bb58c 100644 --- a/drivers/gpio/gpiolib-sysfs.c +++ b/drivers/gpio/gpiolib-sysfs.c @@ -5,6 +5,7 @@ #include <linux/sysfs.h> #include <linux/gpio/consumer.h> #include <linux/gpio/driver.h> +#include <linux/gpio/private.h> #include <linux/interrupt.h> #include <linux/kdev_t.h> #include <linux/slab.h> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 548cf41c6179..197cac0e3e99 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -150,6 +150,28 @@ struct gpio_desc *gpiochip_get_desc(struct gpio_chip *chip, return &gdev->descs[hwnum]; } +/** + * gpiod_to_offset - obtain the local GPIO number from a global unique + * descriptor + * @desc: gpio whose local gpio number should be returned + * + * It converts the global unique descriptor into the gpio chip local gpio + * number. This can be useful if you need to do further device configuration + * e.g. for a MFD. Use this function with caution. You will get a wrong number + * if you pass the wrong descriptor. + * + * Return: + * * the GPIO number of the passed descriptor relative to its chip + * * -EINVAL if desc is invalid or NULL + */ +int gpiod_to_offset(const struct gpio_desc *desc) +{ + if (IS_ERR_OR_NULL(desc)) + return -EINVAL; + return desc - &desc->gdev->descs[0]; +} +EXPORT_SYMBOL_GPL(gpiod_to_offset); + /** * desc_to_gpio - convert a GPIO descriptor to the integer namespace * @desc: GPIO descriptor diff --git a/drivers/gpio/gpiolib.h b/drivers/gpio/gpiolib.h index a7f93ce6e114..a586a793b084 100644 --- a/drivers/gpio/gpiolib.h +++ b/drivers/gpio/gpiolib.h @@ -124,14 +124,6 @@ int gpiod_configure_flags(struct gpio_desc *desc, const char *con_id, int gpiod_hog(struct gpio_desc *desc, const char *name, unsigned long lflags, enum gpiod_flags dflags); -/* - * Return the GPIO number of the passed descriptor relative to its chip - */ -static inline int gpiod_to_offet(const struct gpio_desc *desc) -{ - return desc - &desc->gdev->descs[0]; -} - /* With descriptor prefix */ #define gpiod_emerg(desc, fmt, ...) \ diff --git a/include/linux/gpio/private.h b/include/linux/gpio/private.h new file mode 100644 index 000000000000..56514bdcfac6 --- /dev/null +++ b/include/linux/gpio/private.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Functions listed here should be used with caution. Mostly those functions are + * used by the gpiolib internally. But the time has shown that some special + * drivers needs access to these helpers too. + */ +#ifndef __LINUX_GPIO_PRIVATE_H +#define __LINUX_GPIO_PRIVATE_H + +struct gpio_desc; + +#ifdef CONFIG_GPIOLIB + +int gpiod_to_offset(const struct gpio_desc *desc); + +#else /* CONFIG_GPIOLIB */ + +static inline int gpiod_to_offset(const struct gpio_desc *desc) +{ + /* GPIO can never have been requested */ + WARN_ON(desc); + return 0; +} + +#endif /* CONFIG_GPIOLIB */ + +#endif /* __LINUX_GPIO_PRIVATE_H */ -- 2.20.1
