diff options
| author | Laxman Dewangan <ldewangan@nvidia.com> | 2016-02-22 13:13:28 +0100 |
|---|---|---|
| committer | Laxman Dewangan <ldewangan@nvidia.com> | 2016-02-23 16:05:27 +0100 |
| commit | 828e47e45303d046d17e3f7cb44720cfa3e99f10 (patch) | |
| tree | 08139d61aaf991a9aae4c95df790810d9215e7f0 /drivers/gpio | |
| parent | gpio: clps711x: Use devm_gpiochip_add_data() for gpio registration (diff) | |
| download | linux-828e47e45303d046d17e3f7cb44720cfa3e99f10.tar.xz linux-828e47e45303d046d17e3f7cb44720cfa3e99f10.zip | |
gpio: crystalcove: Use devm_gpiochip_add_data() for gpio registration
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>
Diffstat (limited to 'drivers/gpio')
| -rw-r--r-- | drivers/gpio/gpio-crystalcove.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c index 7865ef0d3352..7c446d118cd6 100644 --- a/drivers/gpio/gpio-crystalcove.c +++ b/drivers/gpio/gpio-crystalcove.c @@ -345,7 +345,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) cg->chip.dbg_show = crystalcove_gpio_dbg_show; cg->regmap = pmic->regmap; - retval = gpiochip_add_data(&cg->chip, cg); + retval = devm_gpiochip_add_data(&pdev->dev, &cg->chip, cg); if (retval) { dev_warn(&pdev->dev, "add gpio chip error: %d\n", retval); return retval; @@ -359,14 +359,10 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) if (retval) { dev_warn(&pdev->dev, "request irq failed: %d\n", retval); - goto out_remove_gpio; + return retval; } return 0; - -out_remove_gpio: - gpiochip_remove(&cg->chip); - return retval; } 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); int irq = platform_get_irq(pdev, 0); - gpiochip_remove(&cg->chip); if (irq >= 0) free_irq(irq, cg); return 0; |