commit ff8efe978d18e2479f998c4722c1eaafd7cd2dd9
author Jiri Slaby <jirislaby@gmail.com> Fri Dec 08 02:39:27 2006 -0800
committer Linus Torvalds <torvalds@woody.osdl.org> Fri Dec 08 08:29:00 2006 -0800
tree 8e6e5b919ce7b161e1ec6568a476bf8a97cf3a24
parent ec3dde578a969ea4b0a8c3d45e02d73abab1b2d3

[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>

drivers/char/istallion.c

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index f1752c8..68645d3 100644
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
@@ -2545,8 +2545,7 @@
 	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 @@
 
 	if (! stli_timeron) {
 		stli_timeron++;
-		stli_timerlist.expires = STLI_TIMEOUT;
-		add_timer(&stli_timerlist);
+		mod_timer(&stli_timerlist, STLI_TIMEOUT);
 	}
 
 	return rc;