From c9594643c095da0a0ad4d5f0a1ff357a84e91524 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Fri, 8 Dec 2006 02:39:05 -0800 Subject: [PATCH] Char: sx, simplify timer logic Use kernel helpers for changing timer internals. Signed-off-by: Jiri Slaby Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/sx.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/drivers/char/sx.c b/drivers/char/sx.c index 401ebab26018..0122b2d93312 100644 --- a/drivers/char/sx.c +++ b/drivers/char/sx.c @@ -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; } -- cgit v1.2.2