Merge tag 'pinctrl-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[sfrench/cifs-2.6.git] / drivers / pinctrl / stm32 / pinctrl-stm32.c

diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c
index 50299ad966590e8ae0ce2813d1f803c790c6ce51..a276c61be217b41b1ce35d33875d8a532033eff0 100644 (file)
--- a/drivers/pinctrl/stm32/pinctrl-stm32.c
+++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -150,12 +150,12 @@ static int stm32_gpio_request(struct gpio_chip *chip, unsigned offset)
                return -EINVAL;
        }
 
-       return pinctrl_request_gpio(chip->base + offset);
+       return pinctrl_gpio_request(chip->base + offset);
 }
 
 static void stm32_gpio_free(struct gpio_chip *chip, unsigned offset)
 {
-       pinctrl_free_gpio(chip->base + offset);
+       pinctrl_gpio_free(chip->base + offset);
 }
 
 static int stm32_gpio_get(struct gpio_chip *chip, unsigned offset)
@@ -289,13 +289,14 @@ static int stm32_gpio_domain_translate(struct irq_domain *d,
        return 0;
 }
 
-static void stm32_gpio_domain_activate(struct irq_domain *d,
-                                      struct irq_data *irq_data)
+static int stm32_gpio_domain_activate(struct irq_domain *d,
+                                     struct irq_data *irq_data, bool early)
 {
        struct stm32_gpio_bank *bank = d->host_data;
        struct stm32_pinctrl *pctl = dev_get_drvdata(bank->gpio_chip.parent);
 
        regmap_field_write(pctl->irqmux[irq_data->hwirq], bank->bank_nr);
+       return 0;
 }
 
 static int stm32_gpio_domain_alloc(struct irq_domain *d,