iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpio: mvebu: Use devm_gpiochip_add_data() for gpio registration

Browse Source 
Use devm_gpiochip_add_data() for GPIO registration and clean the
error path.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
This commit is contained in:
Laxman Dewangan 2016-02-22 17:43:28 +05:30
parent 33bde5c503
commit 00b9ab4a25
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpio/gpio-mvebu.c
View File

@ -756,7 +756,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
BUG(); BUG();
} }
gpiochip_add_data(&mvchip->chip, mvchip); devm_gpiochip_add_data(&pdev->dev, &mvchip->chip, mvchip);
/* Some gpio controllers do not provide irq support */ /* Some gpio controllers do not provide irq support */
if (!of_irq_count(np)) 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); mvchip->irqbase = irq_alloc_descs(-1, 0, ngpios, -1);
if (mvchip->irqbase < 0) { if (mvchip->irqbase < 0) {
dev_err(&pdev->dev, "no irqs\n"); dev_err(&pdev->dev, "no irqs\n");
err = mvchip->irqbase; return mvchip->irqbase;
goto err_gpiochip_add;
} }
gc = irq_alloc_generic_chip("mvebu_gpio_irq", 2, mvchip->irqbase, gc = irq_alloc_generic_chip("mvebu_gpio_irq", 2, mvchip->irqbase,
mvchip->membase, handle_level_irq); mvchip->membase, handle_level_irq);
if (!gc) { if (!gc) {
dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n"); dev_err(&pdev->dev, "Cannot allocate generic irq_chip\n");
err = -ENOMEM; return -ENOMEM;
goto err_gpiochip_add;
} }
gc->private = mvchip; gc->private = mvchip;
@ -828,9 +826,6 @@ err_generic_chip:
IRQ_LEVEL | IRQ_NOPROBE); IRQ_LEVEL | IRQ_NOPROBE);
kfree(gc); kfree(gc);
err_gpiochip_add:
gpiochip_remove(&mvchip->chip);
return err; return err;
} }