]> git.karo-electronics.de Git - linux-beck.git/commitdiff
gpio: palmas: Use devm_gpiochip_add_data() for gpio registration
authorLaxman Dewangan <ldewangan@nvidia.com>
Mon, 22 Feb 2016 12:13:28 +0000 (17:43 +0530)
committerLaxman Dewangan <ldewangan@nvidia.com>
Tue, 23 Feb 2016 15:05:40 +0000 (20:35 +0530)
Use devm_gpiochip_add_data() for GPIO registration and remove the
need of driver callback .remove.

Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
drivers/gpio/gpio-palmas.c

index fdfb3b1e0defdac02ab5c711a640a43c6b1e5221..6f27b3d94d53d6dd2ff16742b4723998316ffc61 100644 (file)
@@ -195,7 +195,8 @@ static int palmas_gpio_probe(struct platform_device *pdev)
        else
                palmas_gpio->gpio_chip.base = -1;
 
-       ret = gpiochip_add_data(&palmas_gpio->gpio_chip, palmas_gpio);
+       ret = devm_gpiochip_add_data(&pdev->dev, &palmas_gpio->gpio_chip,
+                                    palmas_gpio);
        if (ret < 0) {
                dev_err(&pdev->dev, "Could not register gpiochip, %d\n", ret);
                return ret;
@@ -205,20 +206,11 @@ static int palmas_gpio_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int palmas_gpio_remove(struct platform_device *pdev)
-{
-       struct palmas_gpio *palmas_gpio = platform_get_drvdata(pdev);
-
-       gpiochip_remove(&palmas_gpio->gpio_chip);
-       return 0;
-}
-
 static struct platform_driver palmas_gpio_driver = {
        .driver.name    = "palmas-gpio",
        .driver.owner   = THIS_MODULE,
        .driver.of_match_table = of_palmas_gpio_match,
        .probe          = palmas_gpio_probe,
-       .remove         = palmas_gpio_remove,
 };
 
 static int __init palmas_gpio_init(void)