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

[sfrench/cifs-2.6.git] / drivers / gpio / gpio-uniphier.c

diff --git a/drivers/gpio/gpio-uniphier.c b/drivers/gpio/gpio-uniphier.c
index d62cea4ed6b793853c51b71da14a85f9d3a6a104..016d7427ebfac16afee833a60959c2fe87f5a75d 100644 (file)
--- a/drivers/gpio/gpio-uniphier.c
+++ b/drivers/gpio/gpio-uniphier.c
@@ -300,13 +300,14 @@ static int uniphier_gpio_irq_domain_alloc(struct irq_domain *domain,
        return irq_domain_alloc_irqs_parent(domain, virq, 1, &parent_fwspec);
 }
 
-static void uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
-                                             struct irq_data *data)
+static int uniphier_gpio_irq_domain_activate(struct irq_domain *domain,
+                                            struct irq_data *data, bool early)
 {
        struct uniphier_gpio_priv *priv = domain->host_data;
        struct gpio_chip *chip = &priv->chip;
 
        gpiochip_lock_as_irq(chip, data->hwirq + UNIPHIER_GPIO_IRQ_OFFSET);
+       return 0;
 }
 
 static void uniphier_gpio_irq_domain_deactivate(struct irq_domain *domain,