diff options
author | Jiri Slaby <jirislaby@gmail.com> | 2006-12-08 05:39:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:29:00 -0500 |
commit | ff8efe978d18e2479f998c4722c1eaafd7cd2dd9 (patch) | |
tree | 8e6e5b919ce7b161e1ec6568a476bf8a97cf3a24 | |
parent | ec3dde578a969ea4b0a8c3d45e02d73abab1b2d3 (diff) |
[PATCH] Char: istallion, use mod_timer
Do not set expires by hand, use kernel helper, which also calls add_timer.
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | drivers/char/istallion.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c index f1752c81993b..68645d351873 100644 --- a/drivers/char/istallion.c +++ b/drivers/char/istallion.c | |||
@@ -2545,8 +2545,7 @@ static void stli_poll(unsigned long arg) | |||
2545 | struct stlibrd *brdp; | 2545 | struct stlibrd *brdp; |
2546 | unsigned int brdnr; | 2546 | unsigned int brdnr; |
2547 | 2547 | ||
2548 | stli_timerlist.expires = STLI_TIMEOUT; | 2548 | mod_timer(&stli_timerlist, STLI_TIMEOUT); |
2549 | add_timer(&stli_timerlist); | ||
2550 | 2549 | ||
2551 | /* | 2550 | /* |
2552 | * Check each board and do any servicing required. | 2551 | * Check each board and do any servicing required. |
@@ -3610,8 +3609,7 @@ stli_donestartup: | |||
3610 | 3609 | ||
3611 | if (! stli_timeron) { | 3610 | if (! stli_timeron) { |
3612 | stli_timeron++; | 3611 | stli_timeron++; |
3613 | stli_timerlist.expires = STLI_TIMEOUT; | 3612 | mod_timer(&stli_timerlist, STLI_TIMEOUT); |
3614 | add_timer(&stli_timerlist); | ||
3615 | } | 3613 | } |
3616 | 3614 | ||
3617 | return rc; | 3615 | return rc; |