diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 18:30:43 +0900 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-07-11 21:04:05 +0200 |
commit | d3a33a9500f262a40fcf3a9b9b9c3e03890b14dd (patch) | |
tree | 8879face06b0947e9e521340c3835b37102c058b /drivers/watchdog/mtx-1_wdt.c | |
parent | 07bf971a38427e2659603468e5947c39754edb13 (diff) | |
download | op-kernel-dev-d3a33a9500f262a40fcf3a9b9b9c3e03890b14dd.zip op-kernel-dev-d3a33a9500f262a40fcf3a9b9b9c3e03890b14dd.tar.gz |
watchdog: mtx1-wdt: use devm_gpio_request_one()
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>
Diffstat (limited to 'drivers/watchdog/mtx-1_wdt.c')
-rw-r--r-- | drivers/watchdog/mtx-1_wdt.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/watchdog/mtx-1_wdt.c b/drivers/watchdog/mtx-1_wdt.c index 14dab6f..b434111 100644 --- a/drivers/watchdog/mtx-1_wdt.c +++ b/drivers/watchdog/mtx-1_wdt.c @@ -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; } |