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/w83877f_wdt.c | |
| parent | 9af9fc45ddd3e315c51f87392b5048967e4343cd (diff) | |
| parent | 82eb7c5059de64bd43f6b3cf3f128470f2b3fb83 (diff) | |
| download | op-kernel-dev-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.zip op-kernel-dev-88d5a7bb75b5e8f600e79b16abaf008c7fdfd27d.tar.gz | |
Merge ../linux-2.6-watchdog-mm
Diffstat (limited to 'drivers/char/watchdog/w83877f_wdt.c')
| -rw-r--r-- | drivers/char/watchdog/w83877f_wdt.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/char/watchdog/w83877f_wdt.c b/drivers/char/watchdog/w83877f_wdt.c index b0e5f84..3c88fe1 100644 --- a/drivers/char/watchdog/w83877f_wdt.c +++ b/drivers/char/watchdog/w83877f_wdt.c @@ -87,10 +87,10 @@ MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. (1<=timeout<=3600, defau static int nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, int, 0); -MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)"); +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) { |
