diff options
author | Corey Minyard <minyard@acm.org> | 2006-06-28 07:26:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 17:59:05 -0400 |
commit | 409035e088ce15178c5aa157cab493bc22096b6d (patch) | |
tree | d5dd6e7f83a0b23b714516da5f246f724453bd17 /drivers | |
parent | 4ac4360b95496f4137ee19b54e9f7dfa3946984d (diff) |
[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')
-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 83ed6ae466a5..ad26f4b997c5 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) | |||
3738 | proc_ipmi_root->owner = THIS_MODULE; | 3738 | proc_ipmi_root->owner = THIS_MODULE; |
3739 | #endif /* CONFIG_PROC_FS */ | 3739 | #endif /* CONFIG_PROC_FS */ |
3740 | 3740 | ||
3741 | init_timer(&ipmi_timer); | 3741 | setup_timer(&ipmi_timer, ipmi_timeout, 0); |
3742 | ipmi_timer.data = 0; | 3742 | mod_timer(&ipmi_timer, jiffies + IPMI_TIMEOUT_JIFFIES); |
3743 | ipmi_timer.function = ipmi_timeout; | ||
3744 | ipmi_timer.expires = jiffies + IPMI_TIMEOUT_JIFFIES; | ||
3745 | add_timer(&ipmi_timer); | ||
3746 | 3743 | ||
3747 | atomic_notifier_chain_register(&panic_notifier_list, &panic_block); | 3744 | atomic_notifier_chain_register(&panic_notifier_list, &panic_block); |
3748 | 3745 | ||