AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-29 23:36:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchdog: wm831x_wdt: use devm_gpio_request_one()

Browse Source 
Use devm_gpio_request_one() to make cleanup paths simpler.
Also, GPIOF_DIR_OUT | GPIOF_INIT_LOW is replaced with
GPIOF_OUT_INIT_LOW.

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>
This commit is contained in:
Jingoo Han 2013-04-29 18:31:20 +09:00 committed by Wim Van Sebroeck
parent d3a33a9500
commit 7a5da030c6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/watchdog/wm831x_wdt.c
View File

@ -247,9 +247,10 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
reg |= pdata->software << WM831X_WDOG_RST_SRC_SHIFT; reg |= pdata->software << WM831X_WDOG_RST_SRC_SHIFT;
if (pdata->update_gpio) { if (pdata->update_gpio) {
ret = gpio_request_one(pdata->update_gpio, ret = devm_gpio_request_one(&pdev->dev,
GPIOF_DIR_OUT | GPIOF_INIT_LOW, pdata->update_gpio,
"Watchdog update"); GPIOF_OUT_INIT_LOW,
"Watchdog update");
if (ret < 0) { if (ret < 0) {
dev_err(wm831x->dev, dev_err(wm831x->dev,
"Failed to request update GPIO: %d\n", "Failed to request update GPIO: %d\n",
@ -270,7 +271,7 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
} else { } else {
dev_err(wm831x->dev, dev_err(wm831x->dev,
"Failed to unlock security key: %d\n", ret); "Failed to unlock security key: %d\n", ret);
goto err_gpio; goto err;
} }
} }
@ -278,16 +279,13 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
if (ret != 0) { if (ret != 0) {
dev_err(wm831x->dev, "watchdog_register_device() failed: %d\n", dev_err(wm831x->dev, "watchdog_register_device() failed: %d\n",
ret); ret);
goto err_gpio; goto err;
} }
dev_set_drvdata(&pdev->dev, driver_data); dev_set_drvdata(&pdev->dev, driver_data);
return 0; return 0;
err_gpio:
if (driver_data->update_gpio)
gpio_free(driver_data->update_gpio);
err: err:
return ret; return ret;
} }
@ -298,9 +296,6 @@ static int wm831x_wdt_remove(struct platform_device *pdev)
watchdog_unregister_device(&driver_data->wdt); watchdog_unregister_device(&driver_data->wdt);
if (driver_data->update_gpio)
gpio_free(driver_data->update_gpio);
return 0; return 0;
} }