Re: watchdog: Convert ep93xx driver to watchdog core

[Mika Westerberg <mika.westerberg@xxxxxx>]

On Wed, Mar 14, 2012 at 10:31:50AM -0700, H Hartley Sweeten wrote:
> Convert the ep93xx_wdt driver to the watchdog framework API.
> 
> Also, use the dev_<fmt> functions instead of pr_<fmt> for logging.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> Cc: Wim Van Sebroeck <wim@xxxxxxxxx>
> Cc: Ryan Mallon <rmallon@xxxxxxxxx>
> Cc: Mika Westerberg <mika.westerberg@xxxxxx>

While testing this I noticed that you missed to set the initial timeout of the
wdt device. Otherwise doing WDIOC_GETTIMEOUT fails.

With that fixed,

Reviewed-by: Mika Westerberg <mika.westerberg@xxxxxx>
Tested-by: Mika Westerberg <mika.westerberg@xxxxxx>

diff --git a/drivers/watchdog/ep93xx_wdt.c b/drivers/watchdog/ep93xx_wdt.c
index 414ce8f..29575f8 100644
--- a/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@ -139,6 +139,7 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)
 
 	val = readl(mmio_base + EP93XX_WATCHDOG);
 	ep93xx_wdt_wdd.bootstatus = (val & 0x01) ? WDIOF_CARDRESET : 0;
+	ep93xx_wdt_wdd.timeout = timeout;
 
 	watchdog_set_nowayout(&ep93xx_wdt_wdd, nowayout);
 
--
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