On Tue, Mar 31, 2015 at 12:02 PM, Guenter Roeck <linux@xxxxxxxxxxxx> wrote: > On 03/31/2015 11:49 AM, Andrew Bresticker wrote: >> >> From: Naidu Tellapati <naidu.tellapati@xxxxxxxxxx> >> >> Currently the watchdog timeout is initialized to 0. Initialize it to >> its default value instead. >> >> Signed-off-by: Naidu Tellapati <naidu.tellapati@xxxxxxxxxx> >> Signed-off-by: Andrew Bresticker <abrestic@xxxxxxxxxxxx> >> Cc: Ezequiel Garcia <ezequiel.garcia@xxxxxxxxxx> >> --- >> drivers/watchdog/imgpdc_wdt.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c >> index c4151cd..f3f65ac 100644 >> --- a/drivers/watchdog/imgpdc_wdt.c >> +++ b/drivers/watchdog/imgpdc_wdt.c >> @@ -42,7 +42,7 @@ >> #define PDC_WDT_MIN_TIMEOUT 1 >> #define PDC_WDT_DEF_TIMEOUT 64 >> >> -static int heartbeat; >> +static int heartbeat = PDC_WDT_DEF_TIMEOUT; >> module_param(heartbeat, int, 0); >> MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds. " >> "(default = " __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")"); >> > > The idea with watchdog_init_timeout() is that it can take the > timeout from devicetree unless the module parameter is provided. > By pre-initializing the module parameter, you defeat that and > make watchdog_init_timeout more or less a no-op. You might as well > set pdc_wdt->wdt_dev.timeout directly and not call watchdog_init_timeout > at all if that is what you want. > > The "expected" solution would be to pre-initialize pdc_wdt->wdt_dev.timeout > but leave the module parameter alone. Ah, right - that would be better. It looks like a patch that is almost identical to mine has already been accepted - see linux-next commit c774d71 ["watchdog: imgpdc: Fix default heartbeat"] - but I can follow up with a patch that uses the approach you suggested. Thanks, Andrew -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
