redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

[PATCH] Char: sx, simplify timer logic

Browse source 
Use kernel helpers for changing timer internals.

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>
This commit is contained in:
Jiri Slaby 2006-12-08 02:39:05 -08:00 committed by Linus Torvalds
parent 15b611f63f
commit c9594643c0
1 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/char/sx.c
View file

@ -1353,10 +1353,7 @@ static void sx_pollfunc(unsigned long data)
sx_interrupt(0, board);
init_timer(&board->timer);
board->timer.expires = jiffies + sx_poll;
add_timer(&board->timer);
mod_timer(&board->timer, jiffies + sx_poll);
func_exit();
}
@ -2134,14 +2131,10 @@ static int sx_init_board(struct sx_board *board)
/* The timer should be initialized anyway: That way we can
safely del_timer it when the module is unloaded. */
init_timer(&board->timer);
setup_timer(&board->timer, sx_pollfunc, (unsigned long)board);
if (board->poll) {
board->timer.data = (unsigned long)board;
board->timer.function = sx_pollfunc;
board->timer.expires = jiffies + board->poll;
add_timer(&board->timer);
}
if (board->poll)
mod_timer(&board->timer, jiffies + board->poll);
} else {
board->irq = 0;
}