public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jiri Slaby <jirislaby@gmail.com>
To: Andrew Morton <akpm@osdl.org>
Cc: <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/5] Char: istallion, use mod_timer
Date: Sat, 11 Nov 2006 22:49:12 +0100 (CET)	[thread overview]
Message-ID: <15630210681376711290@wsc.cz> (raw)
In-Reply-To: <196416110522272@wsc.cz>

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>

---
commit fc0e3ad83dbfac6d4b245319faff5f726974a3cf
tree 00cda6f05eb6e27a5e5043b0ce7e4fb512ea7287
parent 010cb3032661418012dd0949ff3566927ed430cd
author Jiri Slaby <jirislaby@gmail.com> Sat, 11 Nov 2006 02:32:18 +0100
committer Jiri Slaby <jirislaby@gmail.com> Sat, 11 Nov 2006 22:23:37 +0100

 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 cbbc3cd..7f5b8d8 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;

      parent reply	other threads:[~2006-11-11 21:49 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-11-11 21:48 [PATCH 1/5] Char: istallion, fix enabling Jiri Slaby
2006-11-11 21:48 ` [PATCH 2/5] Char: istallion, move init and exit code Jiri Slaby
2006-11-11 21:48 ` [PATCH 3/5] Char: istallion, change init sequence Jiri Slaby
2006-11-11 21:49 ` [PATCH 4/5] Char: istallion, dynamic tty device Jiri Slaby
2006-11-11 21:49 ` Jiri Slaby [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=15630210681376711290@wsc.cz \
    --to=jirislaby@gmail.com \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox