On 12/15/2014 04:49 PM, Fabio Estevam wrote:
From: Fabio Estevam <[email protected]>
Fix the following build warning by passing the expected argument type to
watchdog_active():
drivers/watchdog/imx2_wdt.c: In function 'imx2_wdt_suspend':
drivers/watchdog/imx2_wdt.c:340:2: warning: passing argument 1 of
'watchdog_active' from incompatible pointer type [enabled by default]
In file included from drivers/watchdog/imx2_wdt.c:38:0:
include/linux/watchdog.h:104:20: note: expected 'struct watchdog_device *' but
argument is of type 'struct watchdog_device **'
Reported-by: Olof's autobuilder <[email protected]>
Signed-off-by: Fabio Estevam <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
---
drivers/watchdog/imx2_wdt.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index 51d940b..d6add51 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -337,7 +337,7 @@ static int imx2_wdt_suspend(struct device *dev)
imx2_wdt_ping(wdog);
/* Watchdog has been stopped but IP block is still running */
- if (!watchdog_active(&wdog) && imx2_wdt_is_running(wdev))
+ if (!watchdog_active(wdog) && imx2_wdt_is_running(wdev))
del_timer_sync(&wdev->timer);
clk_disable_unprepare(wdev->clk);
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
