]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
watchdog: mtx1-wdt: use devm_gpio_request_one()
authorJingoo Han <jg1.han@samsung.com>
Mon, 29 Apr 2013 09:30:43 +0000 (18:30 +0900)
committerWim Van Sebroeck <wim@iguana.be>
Sun, 26 May 2013 13:03:47 +0000 (15:03 +0200)
Use devm_gpio_request_one() to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/mtx-1_wdt.c

index 14dab6ff87aa4816a6f84b76ada07a295f52a4dc..b4341110ad4f43eef5038a9e3d82a7b2644b2ab8 100644 (file)
@@ -209,7 +209,7 @@ static int mtx1_wdt_probe(struct platform_device *pdev)
        int ret;
 
        mtx1_wdt_device.gpio = pdev->resource[0].start;
-       ret = gpio_request_one(mtx1_wdt_device.gpio,
+       ret = devm_gpio_request_one(&pdev->dev, mtx1_wdt_device.gpio,
                                GPIOF_OUT_INIT_HIGH, "mtx1-wdt");
        if (ret < 0) {
                dev_err(&pdev->dev, "failed to request gpio");
@@ -241,7 +241,6 @@ static int mtx1_wdt_remove(struct platform_device *pdev)
                wait_for_completion(&mtx1_wdt_device.stop);
        }
 
-       gpio_free(mtx1_wdt_device.gpio);
        misc_deregister(&mtx1_wdt_misc);
        return 0;
 }