Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-mvebu.c

diff --git a/drivers/gpio/gpio-mvebu.c b/drivers/gpio/gpio-mvebu.c
index a5eacc1dff094463aecd281d09cffa308a0fde89..11c6582ef0a6cf9aa2ef2a4496202b077bad3a4c 100644 (file)
--- a/drivers/gpio/gpio-mvebu.c
+++ b/drivers/gpio/gpio-mvebu.c
@@ -756,7 +756,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
                BUG();
        }
 
-       gpiochip_add_data(&mvchip->chip, mvchip);
+       devm_gpiochip_add_data(&pdev->dev, &mvchip->chip, mvchip);
 
        /* Some gpio controllers do not provide irq support */
        if (!of_irq_count(np))
@@ -777,16 +777,14 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
        mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
        if (mvchip->irqbase < 0) {
                dev_err(&pdev->dev, "no irqs\n");
-               err = mvchip->irqbase;
-               goto err_gpiochip_add;
+               return mvchip->irqbase;
        }
 
        gc = irq_alloc_generic_chip("mvebu_gpio_irq", 2, mvchip->irqbase,
                                    mvchip->membase, handle_level_irq);
        if (!gc) {
                dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");
-               err = -ENOMEM;
-               goto err_gpiochip_add;
+               return -ENOMEM;
        }
 
        gc->private = mvchip;
@@ -828,9 +826,6 @@ err_generic_chip:
                                IRQ_LEVEL | IRQ_NOPROBE);
        kfree(gc);
 
-err_gpiochip_add:
-       gpiochip_remove(&mvchip->chip);
-
        return err;
 }