Commit 89ad556b authored by Thierry Reding's avatar Thierry Reding Committed by Linus Walleij

gpio: Avoid using pin ranges with !PINCTRL

Do not use the struct gpio_device's .pin_ranges field if the PINCTRL
Kconfig symbol is not selected to avoid build failures.

Fixes: 2ab73c6d ("gpio: Support GPIO controllers without pin-ranges")
Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
Link: https://lore.kernel.org/r/20200330090257.2332864-1-thierry.reding@gmail.comReviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5f4bf171
...@@ -2745,10 +2745,12 @@ static inline void gpiochip_irqchip_free_valid_mask(struct gpio_chip *gpiochip) ...@@ -2745,10 +2745,12 @@ static inline void gpiochip_irqchip_free_valid_mask(struct gpio_chip *gpiochip)
*/ */
int gpiochip_generic_request(struct gpio_chip *chip, unsigned offset) int gpiochip_generic_request(struct gpio_chip *chip, unsigned offset)
{ {
if (!list_empty(&chip->gpiodev->pin_ranges)) #ifdef CONFIG_PINCTRL
return pinctrl_gpio_request(chip->gpiodev->base + offset); if (list_empty(&chip->gpiodev->pin_ranges))
return 0; return 0;
#endif
return pinctrl_gpio_request(chip->gpiodev->base + offset);
} }
EXPORT_SYMBOL_GPL(gpiochip_generic_request); EXPORT_SYMBOL_GPL(gpiochip_generic_request);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment