diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 23:24:34 +0100 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-02-13 23:24:34 +0100 |
| commit | 88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d (patch) | |
| tree | 0ff6ddf9d7ba817f62d51c94a2db333f22880501 /drivers/char/watchdog/shwdt.c | |
| parent | 9af9fc45ddd3e315c51f87392b5048967e4343cd (diff) | |
| parent | 82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff) | |
| download | talos-obmc-linux-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.tar.gz talos-obmc-linux-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.zip | |
Merge ../linux-2.6-watchdog-mm
Diffstat (limited to 'drivers/char/watchdog/shwdt.c')
| -rw-r--r-- | drivers/char/watchdog/shwdt.c | 8 |
1 files changed, 3 insertions, 5 deletions
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", |
