Merge tag 'for-linus-20191129' of git://git.kernel.dk/linux-block

[linux.git] / drivers / pinctrl / pinctrl-oxnas.c

diff --git a/drivers/pinctrl/pinctrl-oxnas.c b/drivers/pinctrl/pinctrl-oxnas.c
index 55488ca246f174e2bd77a9ac639d79dda6815b69..674b7b5919df527aaf39414ed38b3128fe7520cd 100644 (file)
--- a/drivers/pinctrl/pinctrl-oxnas.c
+++ b/drivers/pinctrl/pinctrl-oxnas.c
@@ -1196,7 +1196,7 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
        struct oxnas_gpio_bank *bank;
        unsigned int id, ngpios;
        int irq, ret;
-       struct resource *res;
+       struct gpio_irq_chip *girq;
 
        if (of_parse_phandle_with_fixed_args(np, "gpio-ranges",
                                             3, 0, &pinspec)) {
@@ -1219,8 +1219,7 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
 
        bank = &oxnas_gpio_banks[id];
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       bank->reg_base = devm_ioremap_resource(&pdev->dev, res);
+       bank->reg_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(bank->reg_base))
                return PTR_ERR(bank->reg_base);
 
@@ -1232,6 +1231,18 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
        bank->gpio_chip.parent = &pdev->dev;
        bank->gpio_chip.of_node = np;
        bank->gpio_chip.ngpio = ngpios;
+       girq = &bank->gpio_chip.irq;
+       girq->chip = &bank->irq_chip;
+       girq->parent_handler = oxnas_gpio_irq_handler;
+       girq->num_parents = 1;
+       girq->parents = devm_kcalloc(&pdev->dev, 1, sizeof(*girq->parents),
+                                    GFP_KERNEL);
+       if (!girq->parents)
+               return -ENOMEM;
+       girq->parents[0] = irq;
+       girq->default_type = IRQ_TYPE_NONE;
+       girq->handler = handle_level_irq;
+
        ret = gpiochip_add_data(&bank->gpio_chip, bank);
        if (ret < 0) {
                dev_err(&pdev->dev, "Failed to add GPIO chip %u: %d\n",
@@ -1239,18 +1250,6 @@ static int oxnas_gpio_probe(struct platform_device *pdev)
                return ret;
        }
 
-       ret = gpiochip_irqchip_add(&bank->gpio_chip, &bank->irq_chip,
-                               0, handle_level_irq, IRQ_TYPE_NONE);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "Failed to add IRQ chip %u: %d\n",
-                       id, ret);
-               gpiochip_remove(&bank->gpio_chip);
-               return ret;
-       }
-
-       gpiochip_set_chained_irqchip(&bank->gpio_chip, &bank->irq_chip,
-                                    irq, oxnas_gpio_irq_handler);
-
        return 0;
 }