mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
gpio: mvebu: Use devm_gpiochip_add_data() for gpio registration
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:
parent
33bde5c503
commit
00b9ab4a25
1 changed files with 3 additions and 8 deletions
|
@ -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 @@ static int mvebu_gpio_probe(struct platform_device *pdev)
|
|||
IRQ_LEVEL | IRQ_NOPROBE);
|
||||
kfree(gc);
|
||||
|
||||
err_gpiochip_add:
|
||||
gpiochip_remove(&mvchip->chip);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue