summaryrefslogtreecommitdiff
path: root/drivers/char/istallion.c
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 13:39:27 +0300
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 19:29:00 +0300
commitff8efe978d18e2479f998c4722c1eaafd7cd2dd9 (patch)
tree8e6e5b919ce7b161e1ec6568a476bf8a97cf3a24 /drivers/char/istallion.c
parentec3dde578a969ea4b0a8c3d45e02d73abab1b2d3 (diff)
downloadlinux-ff8efe978d18e2479f998c4722c1eaafd7cd2dd9.tar.xz
[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>
Diffstat (limited to 'drivers/char/istallion.c')
-rw-r--r--drivers/char/istallion.c6
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)
struct stlibrd *brdp;
unsigned int brdnr;
- stli_timerlist.expires = STLI_TIMEOUT;
- add_timer(&stli_timerlist);
+ mod_timer(&stli_timerlist, STLI_TIMEOUT);
/*
* Check each board and do any servicing required.
@@ -3610,8 +3609,7 @@ stli_donestartup:
if (! stli_timeron) {
stli_timeron++;
- stli_timerlist.expires = STLI_TIMEOUT;
- add_timer(&stli_timerlist);
+ mod_timer(&stli_timerlist, STLI_TIMEOUT);
}
return rc;