watchdog: imx2_wdt: Fix the argument of watchdog_active()
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/1 watchdog: imx2_wdt: Fix the argument of watchdog_active()
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 **'
--- drivers/watchdog/imx2_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/imx2_wdt.c +1 -1
@@ -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);
Signature · 1 line
1.9.1
Quoted 5 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Fix the following build warning by passing the expected argument type to
watchdog_active():
Quoted 7 lines
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 fromdrivers/watchdog/imx2_wdt.c:38:0:include/linux/watchdog.h:104:20: note: expected 'structwatchdog_device*' but argument is of type 'structwatchdog_device**'Reported-by Olof's autobuilder <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
Quoted 18 lines
--- drivers/watchdog/imx2_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/watchdog/imx2_wdt.c +1
-1@@ -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);