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

gpio: crystalcove: Use devm_gpiochip_add_data() for gpio registration

Browse Source 
Use devm_gpiochip_add_data() for GPIO registration and remove the
call of gpiochip_remove() from 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 da9d670016
commit 828e47e453
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/gpio/gpio-crystalcove.c
View File

@ -345,7 +345,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
cg->chip.dbg_show = crystalcove_gpio_dbg_show; cg->chip.dbg_show = crystalcove_gpio_dbg_show;
cg->regmap = pmic->regmap; cg->regmap = pmic->regmap;
retval = gpiochip_add_data(&cg->chip, cg); retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg);
if (retval) { if (retval) {
dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval); dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval);
return retval; return retval;
@ -359,14 +359,10 @@ static int crystalcove_gpio_probe(struct platform_device *pdev)
if (retval) { if (retval) {
dev_warn(&pdev->dev, "request irq failed: %d\n", retval); dev_warn(&pdev->dev, "request irq failed: %d\n", retval);
goto out_remove_gpio; return retval;
} }
return 0; return 0;
out_remove_gpio:
gpiochip_remove(&cg->chip);
return retval;
} }
static int crystalcove_gpio_remove(struct platform_device *pdev) static int crystalcove_gpio_remove(struct platform_device *pdev)
@ -374,7 +370,6 @@ static int crystalcove_gpio_remove(struct platform_device *pdev)
struct crystalcove_gpio *cg = platform_get_drvdata(pdev); struct crystalcove_gpio *cg = platform_get_drvdata(pdev);
int irq = platform_get_irq(pdev, 0); int irq = platform_get_irq(pdev, 0);
gpiochip_remove(&cg->chip);
if (irq >= 0) if (irq >= 0)
free_irq(irq, cg); free_irq(irq, cg);
return 0; return 0;