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
index a954d25bac4eb42ebe3f3c874d795ee49cc582b4..a276c61be217b41b1ce35d33875d8a532033eff0 100644 (file)
@@ -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,