Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-omap.c

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 174932165fcb5d8795c992506bd0584c0bebb8e5..415682f692145ded2cc02653d2286a7c0f3665f5 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -857,16 +857,6 @@ static void omap_gpio_unmask_irq(struct irq_data *d)
        spin_unlock_irqrestore(&bank->lock, flags);
 }
 
-static struct irq_chip gpio_irq_chip = {
-       .name           = "GPIO",
-       .irq_shutdown   = omap_gpio_irq_shutdown,
-       .irq_ack        = omap_gpio_ack_irq,
-       .irq_mask       = omap_gpio_mask_irq,
-       .irq_unmask     = omap_gpio_unmask_irq,
-       .irq_set_type   = omap_gpio_irq_type,
-       .irq_set_wake   = omap_gpio_wake_enable,
-};
-
 /*---------------------------------------------------------------------*/
 
 static int omap_mpuio_suspend_noirq(struct device *dev)
@@ -1088,7 +1078,7 @@ omap_mpuio_alloc_gc(struct gpio_bank *bank, unsigned int irq_start,
                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
 }
 
-static int omap_gpio_chip_init(struct gpio_bank *bank)
+static int omap_gpio_chip_init(struct gpio_bank *bank, struct irq_chip *irqc)
 {
        int j;
        static int gpio;
@@ -1137,17 +1127,17 @@ static int omap_gpio_chip_init(struct gpio_bank *bank)
        }
 #endif
 
-       ret = gpiochip_irqchip_add(&bank->chip, &gpio_irq_chip,
+       ret = gpiochip_irqchip_add(&bank->chip, irqc,
                                   irq_base, omap_gpio_irq_handler,
                                   IRQ_TYPE_NONE);
 
        if (ret) {
                dev_err(bank->dev, "Couldn't add irqchip to gpiochip %d\n", ret);
-               ret = gpiochip_remove(&bank->chip);
+               gpiochip_remove(&bank->chip);
                return -ENODEV;
        }
 
-       gpiochip_set_chained_irqchip(&bank->chip, &gpio_irq_chip,
+       gpiochip_set_chained_irqchip(&bank->chip, irqc,
                                     bank->irq, omap_gpio_irq_handler);
 
        for (j = 0; j < bank->width; j++) {
@@ -1172,6 +1162,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
        const struct omap_gpio_platform_data *pdata;
        struct resource *res;
        struct gpio_bank *bank;
+       struct irq_chip *irqc;
        int ret;
 
        match = of_match_device(of_match_ptr(omap_gpio_match), dev);
@@ -1186,6 +1177,18 @@ static int omap_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
 
+       irqc = devm_kzalloc(dev, sizeof(*irqc), GFP_KERNEL);
+       if (!irqc)
+               return -ENOMEM;
+
+       irqc->irq_shutdown = omap_gpio_irq_shutdown,
+       irqc->irq_ack = omap_gpio_ack_irq,
+       irqc->irq_mask = omap_gpio_mask_irq,
+       irqc->irq_unmask = omap_gpio_unmask_irq,
+       irqc->irq_set_type = omap_gpio_irq_type,
+       irqc->irq_set_wake = omap_gpio_wake_enable,
+       irqc->name = dev_name(&pdev->dev);
+
        res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
        if (unlikely(!res)) {
                dev_err(dev, "Invalid IRQ resource\n");
@@ -1241,7 +1244,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
 
        omap_gpio_mod_init(bank);
 
-       ret = omap_gpio_chip_init(bank);
+       ret = omap_gpio_chip_init(bank, irqc);
        if (ret)
                return ret;