diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2016-02-28 13:12:14 -0800 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2016-03-16 21:11:07 +0100 |
| commit | fb32e9b9deeb5df2913deb7d2ae8c36f4f66ecf3 (patch) | |
| tree | 26c4b592457a48ae5d175ece5aa37f1b94fb7f47 /drivers | |
| parent | e21f56219bf636b4abd15a0b076a1c5cba381501 (diff) | |
| download | lwn-fb32e9b9deeb5df2913deb7d2ae8c36f4f66ecf3.tar.gz lwn-fb32e9b9deeb5df2913deb7d2ae8c36f4f66ecf3.zip | |
watchdog: Make set_timeout function optional
For some watchdogs, the watchdog driver handles timeout changes without
explicitly setting any registers. In this situation, the watchdog driver
might only set the 'timeout' variable but do nothing else.
This can as well be handled by the infrastructure, so make the set_timeout
callback optional. If WDIOF_SETTIMEOUT is configured but the .set_timeout
callback is not available, update the timeout variable in the
infrastructure code.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/watchdog_dev.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index ba2ecce4aae6..b5e700186ae0 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c @@ -183,13 +183,20 @@ static unsigned int watchdog_get_status(struct watchdog_device *wdd) static int watchdog_set_timeout(struct watchdog_device *wdd, unsigned int timeout) { - if (!wdd->ops->set_timeout || !(wdd->info->options & WDIOF_SETTIMEOUT)) + int err = 0; + + if (!(wdd->info->options & WDIOF_SETTIMEOUT)) return -EOPNOTSUPP; if (watchdog_timeout_invalid(wdd, timeout)) return -EINVAL; - return wdd->ops->set_timeout(wdd, timeout); + if (wdd->ops->set_timeout) + err = wdd->ops->set_timeout(wdd, timeout); + else + wdd->timeout = timeout; + + return err; } /* |