Merge tag 'loongarch-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai...

[linux-2.6-microblaze.git] / drivers / pinctrl / pinctrl-st.c

diff --git a/drivers/pinctrl/pinctrl-st.c b/drivers/pinctrl/pinctrl-st.c
index c1f36b1..1485573 100644 (file)
--- a/drivers/pinctrl/pinctrl-st.c
+++ b/drivers/pinctrl/pinctrl-st.c
@@ -717,20 +717,13 @@ static void st_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
        __st_gpio_set(bank, offset, value);
 }
 
-static int st_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
-{
-       pinctrl_gpio_direction_input(chip->base + offset);
-
-       return 0;
-}
-
 static int st_gpio_direction_output(struct gpio_chip *chip,
        unsigned offset, int value)
 {
        struct st_gpio_bank *bank = gpiochip_get_data(chip);
 
        __st_gpio_set(bank, offset, value);
-       pinctrl_gpio_direction_output(chip->base + offset);
+       pinctrl_gpio_direction_output(chip, offset);
 
        return 0;
 }
@@ -1330,7 +1323,7 @@ static int st_gpio_irq_request_resources(struct irq_data *d)
 {
        struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 
-       st_gpio_direction_input(gc, d->hwirq);
+       pinctrl_gpio_direction_input(gc, d->hwirq);
 
        return gpiochip_reqres_irq(gc, d->hwirq);
 }
@@ -1488,7 +1481,7 @@ static const struct gpio_chip st_gpio_template = {
        .free                   = gpiochip_generic_free,
        .get                    = st_gpio_get,
        .set                    = st_gpio_set,
-       .direction_input        = st_gpio_direction_input,
+       .direction_input        = pinctrl_gpio_direction_input,
        .direction_output       = st_gpio_direction_output,
        .get_direction          = st_gpio_get_direction,
        .ngpio                  = ST_GPIO_PINS_PER_BANK,