9 files changed, 31 insertions, 73 deletions

diff --git a/drivers/char/watchdog/alim7101_wdt.c b/drivers/char/watchdog/alim7101_wdt.c
index 1dacec5c9637..c195078688de 100644
--- a/drivers/char/watchdog/alim7101_wdt.c
+++ b/drivers/char/watchdog/alim7101_wdt.c
@@ -69,7 +69,7 @@ module_param(use_gpio, int, 0);
 MODULE_PARM_DESC(use_gpio, "Use the gpio watchdog.  (required by old cobalt boards)");
 
 static void wdt_timer_ping(unsigned long);
-static struct timer_list timer;
+static DEFINE_TIMER(timer, wdt_timer_ping, 0, 1);
 static unsigned long next_heartbeat;
 static unsigned long wdt_is_open;
 static char wdt_expect_close;
@@ -108,8 +108,7 @@ static void wdt_timer_ping(unsigned long data)
                 printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
         }
         /* Re-set the timer interval */
-        timer.expires = jiffies + WDT_INTERVAL;
-        add_timer(&timer);
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
 }
 
 /*
@@ -147,9 +146,7 @@ static void wdt_startup(void)
         wdt_change(WDT_ENABLE);
 
         /* Start the timer */
-        timer.expires = jiffies + WDT_INTERVAL;
-        add_timer(&timer);
-
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
 
         printk(KERN_INFO PFX "Watchdog timer is now enabled.\n");
 }
@@ -380,10 +377,6 @@ static int __init alim7101_wdt_init(void)
                         timeout);
         }
 
-        init_timer(&timer);
-        timer.function = wdt_timer_ping;
-        timer.data = 1;
-
         rc = misc_register(&wdt_miscdev);
         if (rc) {
                 printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",
diff --git a/drivers/char/watchdog/cpu5wdt.c b/drivers/char/watchdog/cpu5wdt.c
index 00bdabb90f27..bcd7e36ca0aa 100644
--- a/drivers/char/watchdog/cpu5wdt.c
+++ b/drivers/char/watchdog/cpu5wdt.c
@@ -80,10 +80,8 @@ static void cpu5wdt_trigger(unsigned long unused)
         outb(1, port + CPU5WDT_TRIGGER_REG);
 
         /* requeue?? */
-        if( cpu5wdt_device.queue && ticks ) {
-                cpu5wdt_device.timer.expires = jiffies + CPU5WDT_INTERVAL;
-                add_timer(&cpu5wdt_device.timer);
-        }
+        if (cpu5wdt_device.queue && ticks)
+                mod_timer(&cpu5wdt_device.timer, jiffies + CPU5WDT_INTERVAL);
         else {
                 /* ticks doesn't matter anyway */
                 complete(&cpu5wdt_device.stop);
@@ -109,8 +107,7 @@ static void cpu5wdt_start(void)
                 outb(1, port + CPU5WDT_MODE_REG);
                 outb(0, port + CPU5WDT_RESET_REG);
                 outb(0, port + CPU5WDT_ENABLE_REG);
-                cpu5wdt_device.timer.expires = jiffies + CPU5WDT_INTERVAL;
-                add_timer(&cpu5wdt_device.timer);
+                mod_timer(&cpu5wdt_device.timer, jiffies + CPU5WDT_INTERVAL);
         }
         /* if process dies, counter is not decremented */
         cpu5wdt_device.running++;
@@ -245,9 +242,7 @@ static int __devinit cpu5wdt_init(void)
 
         clear_bit(0, &cpu5wdt_device.inuse);
 
-        init_timer(&cpu5wdt_device.timer);
-        cpu5wdt_device.timer.function = cpu5wdt_trigger;
-        cpu5wdt_device.timer.data = 0;
+        setup_timer(&cpu5wdt_device.timer, cpu5wdt_trigger, 0);
 
         cpu5wdt_device.default_ticks = ticks;
 
diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index 391998d260c2..4a328ba0d262 100644
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -118,12 +118,14 @@ static int action = 0;
 module_param(action, int, 0);
 MODULE_PARM_DESC(action, "after watchdog resets, generate: 0 = RESET(*)  1 = SMI  2 = NMI  3 = SCI");
 
+static void zf_ping(unsigned long data);
+
 static int zf_action = GEN_RESET;
 static unsigned long zf_is_open;
 static char zf_expect_close;
 static spinlock_t zf_lock;
 static spinlock_t zf_port_lock;
-static struct timer_list zf_timer;
+static DEFINE_TIMER(zf_timer, zf_ping, 0, 0);
 static unsigned long next_heartbeat = 0;
 
 
@@ -220,9 +222,7 @@ static void zf_timer_on(void)
         next_heartbeat = jiffies + ZF_USER_TIMEO;
 
         /* start the timer for internal ping */
-        zf_timer.expires = jiffies + ZF_HW_TIMEO;
-
-        add_timer(&zf_timer);
+        mod_timer(&zf_timer, jiffies + ZF_HW_TIMEO);
 
         /* start watchdog timer */
         ctrl_reg = zf_get_control();
@@ -260,8 +260,7 @@ static void zf_ping(unsigned long data)
                 zf_set_control(ctrl_reg);
                 spin_unlock_irqrestore(&zf_port_lock, flags);
 
-                zf_timer.expires = jiffies + ZF_HW_TIMEO;
-                add_timer(&zf_timer);
+                mod_timer(&zf_timer, jiffies + ZF_HW_TIMEO);
         }else{
                 printk(KERN_CRIT PFX ": I will reset your machine\n");
         }
@@ -465,11 +464,6 @@ static int __init zf_init(void)
         zf_set_status(0);
         zf_set_control(0);
 
-        /* this is the timer that will do the hard work */
-        init_timer(&zf_timer);
-        zf_timer.function = zf_ping;
-        zf_timer.data = 0;
-
         return 0;
 
 no_reboot:
diff --git a/drivers/char/watchdog/mixcomwd.c b/drivers/char/watchdog/mixcomwd.c
index 7e3308a60afb..f35e2848aa3e 100644
--- a/drivers/char/watchdog/mixcomwd.c
+++ b/drivers/char/watchdog/mixcomwd.c
@@ -56,11 +56,13 @@ static int mixcomwd_ioports[] = { 0x180, 0x280, 0x380, 0x000 };
 #define FLASHCOM_WATCHDOG_OFFSET 0x4
 #define FLASHCOM_ID 0x18
 
+static void mixcomwd_timerfun(unsigned long d);
+
 static unsigned long mixcomwd_opened; /* long req'd for setbit --RR */
 
 static int watchdog_port;
 static int mixcomwd_timer_alive;
-static DEFINE_TIMER(mixcomwd_timer, NULL, 0, 0);
+static DEFINE_TIMER(mixcomwd_timer, mixcomwd_timerfun, 0, 0);
 static char expect_close;
 
 static int nowayout = WATCHDOG_NOWAYOUT;
@@ -77,7 +79,7 @@ static void mixcomwd_timerfun(unsigned long d)
 {
         mixcomwd_ping();
 
-        mod_timer(&mixcomwd_timer,jiffies+ 5*HZ);
+        mod_timer(&mixcomwd_timer, jiffies + 5 * HZ);
 }
 
 /*
@@ -114,12 +116,8 @@ static int mixcomwd_release(struct inode *inode, struct file *file)
                         printk(KERN_ERR "mixcomwd: release called while internal timer alive");
                         return -EBUSY;
                 }
-                init_timer(&mixcomwd_timer);
-                mixcomwd_timer.expires=jiffies + 5 * HZ;
-                mixcomwd_timer.function=mixcomwd_timerfun;
-                mixcomwd_timer.data=0;
                 mixcomwd_timer_alive=1;
-                add_timer(&mixcomwd_timer);
+                mod_timer(&mixcomwd_timer, jiffies + 5 * HZ);
         } else {
                 printk(KERN_CRIT "mixcomwd: WDT device closed unexpectedly.  WDT will not stop!\n");
         }
@@ -285,7 +283,7 @@ static void __exit mixcomwd_exit(void)
                 if(mixcomwd_timer_alive) {
                         printk(KERN_WARNING "mixcomwd: I quit now, hardware will"
                                " probably reboot!\n");
-                        del_timer(&mixcomwd_timer);
+                        del_timer_sync(&mixcomwd_timer);
                         mixcomwd_timer_alive=0;
                 }
         }
diff --git a/drivers/char/watchdog/pcwd.c b/drivers/char/watchdog/pcwd.c
index b056c3c18aa7..6e8b5705b5b7 100644
--- a/drivers/char/watchdog/pcwd.c
+++ b/drivers/char/watchdog/pcwd.c
@@ -843,9 +843,7 @@ static int __devinit pcwatchdog_init(int base_addr)
         /* clear the "card caused reboot" flag */
         pcwd_clear_status();
 
-        init_timer(&pcwd_private.timer);
-        pcwd_private.timer.function = pcwd_timer_ping;
-        pcwd_private.timer.data = 0;
+        setup_timer(&pcwd_private.timer, pcwd_timer_ping, 0);
 
         /*  Disable the board  */
         pcwd_stop();
diff --git a/drivers/char/watchdog/sbc60xxwdt.c b/drivers/char/watchdog/sbc60xxwdt.c
index f5fb8cc23d52..b6282039198c 100644
--- a/drivers/char/watchdog/sbc60xxwdt.c
+++ b/drivers/char/watchdog/sbc60xxwdt.c
@@ -103,7 +103,7 @@ module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
 static void wdt_timer_ping(unsigned long);
-static struct timer_list timer;
+static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
 static unsigned long next_heartbeat;
 static unsigned long wdt_is_open;
 static char wdt_expect_close;
@@ -122,8 +122,7 @@ static void wdt_timer_ping(unsigned long data)
                 /* Ping the WDT by reading from wdt_start */
                 inb_p(wdt_start);
                 /* Re-set the timer interval */
-                timer.expires = jiffies + WDT_INTERVAL;
-                add_timer(&timer);
+                mod_timer(&timer, jiffies + WDT_INTERVAL);
         } else {
                 printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
         }
@@ -138,8 +137,7 @@ static void wdt_startup(void)
         next_heartbeat = jiffies + (timeout * HZ);
 
         /* Start the timer */
-        timer.expires = jiffies + WDT_INTERVAL;
-        add_timer(&timer);
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
         printk(KERN_INFO PFX "Watchdog timer is now enabled.\n");
 }
 
@@ -363,10 +361,6 @@ static int __init sbc60xxwdt_init(void)
                 }
         }
 
-        init_timer(&timer);
-        timer.function = wdt_timer_ping;
-        timer.data = 0;
-
         rc = misc_register(&wdt_miscdev);
         if (rc)
         {
diff --git a/drivers/char/watchdog/sc520_wdt.c b/drivers/char/watchdog/sc520_wdt.c
index ecc73051a3b0..2676a43895a7 100644
--- a/drivers/char/watchdog/sc520_wdt.c
+++ b/drivers/char/watchdog/sc520_wdt.c
@@ -121,7 +121,7 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" _
 static __u16 __iomem *wdtmrctl;
 
 static void wdt_timer_ping(unsigned long);
-static struct timer_list timer;
+static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
 static unsigned long next_heartbeat;
 static unsigned long wdt_is_open;
 static char wdt_expect_close;
@@ -145,8 +145,7 @@ static void wdt_timer_ping(unsigned long data)
                 spin_unlock(&wdt_spinlock);
 
                 /* Re-set the timer interval */
-                timer.expires = jiffies + WDT_INTERVAL;
-                add_timer(&timer);
+                mod_timer(&timer, jiffies + WDT_INTERVAL);
         } else {
                 printk(KERN_WARNING PFX "Heartbeat lost! Will not ping the watchdog\n");
         }
@@ -179,8 +178,7 @@ static int wdt_startup(void)
         next_heartbeat = jiffies + (timeout * HZ);
 
         /* Start the timer */
-        timer.expires = jiffies + WDT_INTERVAL;
-        add_timer(&timer);
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
 
         /* Start the watchdog */
         wdt_config(WDT_ENB | WDT_WRST_ENB | WDT_EXP_SEL_04);
@@ -389,10 +387,6 @@ static int __init sc520_wdt_init(void)
 
         spin_lock_init(&wdt_spinlock);
 
-        init_timer(&timer);
-        timer.function = wdt_timer_ping;
-        timer.data = 0;
-
         /* Check that the timeout value is within it's range ; if not reset to the default */
         if (wdt_set_heartbeat(timeout)) {
                 wdt_set_heartbeat(WATCHDOG_TIMEOUT);
diff --git a/drivers/char/watchdog/shwdt.c b/drivers/char/watchdog/shwdt.c
index dc403629aeb3..cecbedd473a4 100644
--- a/drivers/char/watchdog/shwdt.c
+++ b/drivers/char/watchdog/shwdt.c
@@ -65,10 +65,12 @@ static int clock_division_ratio = WTCSR_CKS_4096;
 
 #define next_ping_period(cks)   msecs_to_jiffies(cks - 4)
 
+static void sh_wdt_ping(unsigned long data);
+
 static unsigned long shwdt_is_open;
 static struct watchdog_info sh_wdt_info;
 static char shwdt_expect_close;
-static struct timer_list timer;
+static DEFINE_TIMER(timer, sh_wdt_ping, 0, 0);
 static unsigned long next_heartbeat;
 
 #define WATCHDOG_HEARTBEAT 30                   /* 30 sec default heartbeat */
@@ -433,10 +435,6 @@ static int __init sh_wdt_init(void)
                        "be 1<=x<=3600, using %d\n", heartbeat);
         }
 
-        init_timer(&timer);
-        timer.function = sh_wdt_ping;
-        timer.data = 0;
-
         rc = register_reboot_notifier(&sh_wdt_notifier);
         if (unlikely(rc)) {
                 printk(KERN_ERR PFX "Can't register reboot notifier (err=%d)\n",
diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c
index 7dcd80aa7373..3c88fe18f4f4 100644
--- a/drivers/char/watchdog/w83877f_wdt.c
+++ b/drivers/char/watchdog/w83877f_wdt.c
@@ -90,7 +90,7 @@ module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
 
 static void wdt_timer_ping(unsigned long);
-static struct timer_list timer;
+static DEFINE_TIMER(timer, wdt_timer_ping, 0, 0);
 static unsigned long next_heartbeat;
 static unsigned long wdt_is_open;
 static char wdt_expect_close;
@@ -114,8 +114,7 @@ static void wdt_timer_ping(unsigned long data)
                 inb_p(WDT_PING);
 
                 /* Re-set the timer interval */
-                timer.expires = jiffies + WDT_INTERVAL;
-                add_timer(&timer);
+                mod_timer(&timer, jiffies + WDT_INTERVAL);
 
                 spin_unlock(&wdt_spinlock);
 
@@ -155,8 +154,7 @@ static void wdt_startup(void)
         next_heartbeat = jiffies + (timeout * HZ);
 
         /* Start the timer */
-        timer.expires = jiffies + WDT_INTERVAL;
-        add_timer(&timer);
+        mod_timer(&timer, jiffies + WDT_INTERVAL);
 
         wdt_change(WDT_ENABLE);
 
@@ -377,10 +375,6 @@ static int __init w83877f_wdt_init(void)
                 goto err_out_region1;
         }
 
-        init_timer(&timer);
-        timer.function = wdt_timer_ping;
-        timer.data = 0;
-
         rc = misc_register(&wdt_miscdev);
         if (rc)
         {