watchdog: cpwd: Use setup_timer()

The function setup_timer combines the initialization of a timer with
the initialization of the timer's function and data fields.
The multiline code for timer initialization is now replaced
with function setup_timer.

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index 02007689e9ca29976a2c9c8a2474558802beec27..71ee07950e630492a29f007cab84ddc04525cb69 100644 (file)
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -611,9 +611,7 @@ static int cpwd_probe(struct platform_device *op)
        }
 
        if (p->broken) {
-               init_timer(&cpwd_timer);
-               cpwd_timer.function     = cpwd_brokentimer;
-               cpwd_timer.data         = (unsigned long) p;
+               setup_timer(&cpwd_timer, cpwd_brokentimer, (unsigned long)p);
                cpwd_timer.expires      = WD_BTIMEOUT;
 
                pr_info("PLD defect workaround enabled for model %s\n",