gpio: pxa: use new pinctrl GPIO helpers

Replace the pinctrl helpers taking the global GPIO number as argument
with the improved variants that instead take a pointer to the GPIO chip
and the controller-relative offset.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c
index cae9661862fe1ddade8676596244d4a474fbf8ce..2fd797b91270f3976ddf9bd0ea73eafcab5300fa 100644 (file)
--- a/drivers/gpio/gpio-pxa.c
+++ b/drivers/gpio/gpio-pxa.c
@@ -260,7 +260,7 @@ static int pxa_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
        int ret;
 
        if (pxa_gpio_has_pinctrl()) {
-               ret = pinctrl_gpio_direction_input(chip->base + offset);
+               ret = pinctrl_gpio_direction_input_new(chip, offset);
                if (ret)
                        return ret;
        }
@@ -289,7 +289,7 @@ static int pxa_gpio_direction_output(struct gpio_chip *chip,
        writel_relaxed(mask, base + (value ? GPSR_OFFSET : GPCR_OFFSET));
 
        if (pxa_gpio_has_pinctrl()) {
-               ret = pinctrl_gpio_direction_output(chip->base + offset);
+               ret = pinctrl_gpio_direction_output_new(chip, offset);
                if (ret)
                        return ret;
        }