From: Jiri Slaby <jirislaby@gmail.com>
Date: Fri, 8 Dec 2006 10:39:27 +0000 (-0800)
Subject: [PATCH] Char: istallion, use mod_timer
X-Git-Tag: v2.6.20-rc1~34^2~152
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ff8efe978d18e2479f998c4722c1eaafd7cd2dd9;p=linux-2.6-omap-h63xx.git

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

diff --git a/drivers/char/istallion.c b/drivers/char/istallion.c
index f1752c81993..68645d35187 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;