summaryrefslogtreecommitdiffstats
path: root/drivers/gpio/gpio-pxa.c
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2020-04-01 22:05:26 +0200
committerLinus Walleij <linus.walleij@linaro.org>2020-04-02 09:16:06 +0200
commitf0254b51cbbfe040142cb824a1ff623de698ae8a (patch)
treecad69cf2e336acfab7749862e34383431084ae8a /drivers/gpio/gpio-pxa.c
parent33dd888263199676946f1c789e821d39a9a79d98 (diff)
downloadlinux-stable-f0254b51cbbfe040142cb824a1ff623de698ae8a.tar.gz
linux-stable-f0254b51cbbfe040142cb824a1ff623de698ae8a.tar.bz2
linux-stable-f0254b51cbbfe040142cb824a1ff623de698ae8a.zip
gpio: Unconditionally assign .request()/.free()
The gpiochip_generic_request() and gpiochip_generic_free() functions can now deal properly with chips that don't have any pin-ranges defined, so they can be assigned unconditionally. Suggested-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Thierry Reding <treding@nvidia.com> Link: https://lore.kernel.org/r/20200401200527.2982450-1-thierry.reding@gmail.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
-rw-r--r--drivers/gpio/gpio-pxa.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index 567742d962ae..1361270ecf8c 100644
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -361,11 +361,8 @@ static int pxa_init_gpio_chip(struct pxa_gpio_chip *pchip, int ngpio,
pchip->chip.set = pxa_gpio_set;
pchip->chip.to_irq = pxa_gpio_to_irq;
pchip->chip.ngpio = ngpio;
-
- if (pxa_gpio_has_pinctrl()) {
- pchip->chip.request = gpiochip_generic_request;
- pchip->chip.free = gpiochip_generic_free;
- }
+ pchip->chip.request = gpiochip_generic_request;
+ pchip->chip.free = gpiochip_generic_free;
#ifdef CONFIG_OF_GPIO
pchip->chip.of_node = np;