[PATCH v2 02/16] watchdog: add error messages when initializing timeout fails

Wolfram Sang
2019-04-16T10:26:49Z

This not only removes boilerplate code from watchdog drivers, it can
also be more specific which of the supplied value actually fails. Also,
the loglevel becomes now consistent across drivers.

Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/watchdog/watchdog_core.c | 6 ++++++
1 file changed, 6 insertions(+)

diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c
index 21e53cc49977..cd3ca6b366ef 100644
--- a/drivers/watchdog/watchdog_core.c
+++ b/drivers/watchdog/watchdog_core.c
@@ -126,6 +126,8 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
wdd->timeout = timeout_parm;
return 0;
}
+ dev_err(dev, "driver supplied timeout (%u) out of range\n",
+ timeout_parm);
ret = -EINVAL;
}

@@ -136,9 +138,13 @@ int watchdog_init_timeout(struct watchdog_device *wdd,
wdd->timeout = t;
return 0;
}
+ dev_err(dev, "DT supplied timeout (%u) out of range\n", t);
ret = -EINVAL;
}

+ if (ret < 0 && wdd->timeout)
+ dev_warn(dev, "falling back to default timeout (%u)\n", wdd->timeout);
+
return ret;
}
EXPORT_SYMBOL_GPL(watchdog_init_timeout);
--
2.11.0