diff options
| author | Corey Minyard <minyard@acm.org> | 2006-06-28 04:26:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 14:59:05 -0700 |
| commit | 409035e088ce15178c5aa157cab493bc22096b6d (patch) | |
| tree | d5dd6e7f83a0b23b714516da5f246f724453bd17 /drivers/char/ipmi | |
| parent | 4ac4360b95496f4137ee19b54e9f7dfa3946984d (diff) | |
| download | kernel_samsung_tuna-409035e088ce15178c5aa157cab493bc22096b6d.zip kernel_samsung_tuna-409035e088ce15178c5aa157cab493bc22096b6d.tar.gz kernel_samsung_tuna-409035e088ce15178c5aa157cab493bc22096b6d.tar.bz2 | |
[PATCH] IPMI: tidy msghandler timer
Tidy up the timer usage in the IPMI driver.
Signed-off-by: Corey Minyard <minyard@acm.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/ipmi')
| -rw-r--r-- | drivers/char/ipmi/ipmi_msghandler.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 83ed6ae..ad26f4b 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -3738,11 +3738,8 @@ static int ipmi_init_msghandler(void) proc_ipmi_root->owner = THIS_MODULE; #endif /* CONFIG_PROC_FS */ - init_timer(&ipmi_timer); - ipmi_timer.data = 0; - ipmi_timer.function = ipmi_timeout; - ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES; - add_timer(&ipmi_timer); + setup_timer(&ipmi_timer, ipmi_timeout, 0); + mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES); atomic_notifier_chain_register(&panic_notifier_list, &panic_block); |