watchdog: imx2_wdt: Fix the argument of watchdog_active()
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 16 Dec 2014 00:49:59 +0000 (22:49 -0200)
committerWim Van Sebroeck <wim@iguana.be>
Thu, 18 Dec 2014 15:01:20 +0000 (16:01 +0100)
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 <build@lixom.net>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
drivers/watchdog/imx2_wdt.c

index 51d940beb3113cf8dada35b61d018beac5f92cb0..d6add516a7a7635662e5c1cb12a10206b93c5544 100644 (file)
@@ -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);