Message ID | 20190416102515.12269-6-wsa+renesas@sang-engineering.com (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
Series | watchdog: refactor init_timeout and update users | expand |
On Tue, Apr 16, 2019 at 12:25:04PM +0200, Wolfram Sang wrote: > The core will print out details now. > > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > drivers/watchdog/ebc-c384_wdt.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c > index 4c4c8ce78021..c176f59fea28 100644 > --- a/drivers/watchdog/ebc-c384_wdt.c > +++ b/drivers/watchdog/ebc-c384_wdt.c > @@ -117,10 +117,7 @@ static int ebc_c384_wdt_probe(struct device *dev, unsigned int id) > wdd->max_timeout = WATCHDOG_MAX_TIMEOUT; > > watchdog_set_nowayout(wdd, nowayout); > - > - if (watchdog_init_timeout(wdd, timeout, dev)) > - dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n", > - timeout, WATCHDOG_TIMEOUT); > + watchdog_init_timeout(wdd, timeout, dev); > > return devm_watchdog_register_device(dev, wdd); > } > -- > 2.11.0 Acked-by: William Breathitt Gray <vilhelm.gray@gmail.com>
diff --git a/drivers/watchdog/ebc-c384_wdt.c b/drivers/watchdog/ebc-c384_wdt.c index 4c4c8ce78021..c176f59fea28 100644 --- a/drivers/watchdog/ebc-c384_wdt.c +++ b/drivers/watchdog/ebc-c384_wdt.c @@ -117,10 +117,7 @@ static int ebc_c384_wdt_probe(struct device *dev, unsigned int id) wdd->max_timeout = WATCHDOG_MAX_TIMEOUT; watchdog_set_nowayout(wdd, nowayout); - - if (watchdog_init_timeout(wdd, timeout, dev)) - dev_warn(dev, "Invalid timeout (%u seconds), using default (%u seconds)\n", - timeout, WATCHDOG_TIMEOUT); + watchdog_init_timeout(wdd, timeout, dev); return devm_watchdog_register_device(dev, wdd); }