watchdog: lpc18xx_wdt: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly.

Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Joachim Eastwood <manabian@gmail.com>
Cc: linux-watchdog@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Guenter Roeck <linux@roeck-us.net>

diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
index 3b8bb59adf027bddf5fde1013c3621f4b480e9a3..b4221f43cd947f625d8124062cb05ccbed875ef8 100644 (file)
--- a/drivers/watchdog/lpc18xx_wdt.c
+++ b/drivers/watchdog/lpc18xx_wdt.c
@@ -78,10 +78,10 @@ static int lpc18xx_wdt_feed(struct watchdog_device *wdt_dev)
        return 0;
 }
 
-static void lpc18xx_wdt_timer_feed(unsigned long data)
+static void lpc18xx_wdt_timer_feed(struct timer_list *t)
 {
-       struct watchdog_device *wdt_dev = (struct watchdog_device *)data;
-       struct lpc18xx_wdt_dev *lpc18xx_wdt = watchdog_get_drvdata(wdt_dev);
+       struct lpc18xx_wdt_dev *lpc18xx_wdt = from_timer(lpc18xx_wdt, t, timer);
+       struct watchdog_device *wdt_dev = &lpc18xx_wdt->wdt_dev;
 
        lpc18xx_wdt_feed(wdt_dev);
 
@@ -96,7 +96,9 @@ static void lpc18xx_wdt_timer_feed(unsigned long data)
  */
 static int lpc18xx_wdt_stop(struct watchdog_device *wdt_dev)
 {
-       lpc18xx_wdt_timer_feed((unsigned long)wdt_dev);
+       struct lpc18xx_wdt_dev *lpc18xx_wdt = watchdog_get_drvdata(wdt_dev);
+
+       lpc18xx_wdt_timer_feed(&lpc18xx_wdt->timer);
 
        return 0;
 }
@@ -267,8 +269,7 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev)
 
        __lpc18xx_wdt_set_timeout(lpc18xx_wdt);
 
-       setup_timer(&lpc18xx_wdt->timer, lpc18xx_wdt_timer_feed,
-                   (unsigned long)&lpc18xx_wdt->wdt_dev);
+       timer_setup(&lpc18xx_wdt->timer, lpc18xx_wdt_timer_feed, 0);
 
        watchdog_set_nowayout(&lpc18xx_wdt->wdt_dev, nowayout);
        watchdog_set_restart_priority(&lpc18xx_wdt->wdt_dev, 128);