mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
watchdog: wm831x: Convert to gpio_request_one()
Use the more modern API. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
parent
690e7a706d
commit
abcf834b80
1 changed files with 3 additions and 10 deletions
|
@ -247,8 +247,9 @@ static int __devinit 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(pdata->update_gpio,
|
ret = gpio_request_one(pdata->update_gpio,
|
||||||
"Watchdog update");
|
GPIOF_DIR_OUT | GPIOF_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",
|
||||||
|
@ -256,14 +257,6 @@ static int __devinit wm831x_wdt_probe(struct platform_device *pdev)
|
||||||
goto err;
|
goto err;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = gpio_direction_output(pdata->update_gpio, 0);
|
|
||||||
if (ret != 0) {
|
|
||||||
dev_err(wm831x->dev,
|
|
||||||
"gpio_direction_output returned: %d\n",
|
|
||||||
ret);
|
|
||||||
goto err_gpio;
|
|
||||||
}
|
|
||||||
|
|
||||||
driver_data->update_gpio = pdata->update_gpio;
|
driver_data->update_gpio = pdata->update_gpio;
|
||||||
|
|
||||||
/* Make sure the watchdog takes hardware updates */
|
/* Make sure the watchdog takes hardware updates */
|
||||||
|
|
Loading…
Reference in a new issue