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>

diff --git a/drivers/gpio/gpio-crystalcove.c b/drivers/gpio/gpio-crystalcove.c
index 7865ef0d3352b0d656201707c61b089b5b6ad7ed..7c446d118cd68f543f63114cd95bf334a11ed67f 100644 (file)
--- 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;