From 86e7e874635ea76fee8608646afcb103414c6e72 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Mon, 5 Mar 2012 14:52:05 +0100 Subject: XTENSA: iss/console, use setup_timer Use setup_timer instead of explicit assignments. Signed-off-by: Jiri Slaby Cc: Chris Zankel Signed-off-by: Greg Kroah-Hartman --- arch/xtensa/platforms/iss/console.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 19a802a..01842e4 100644 --- a/arch/xtensa/platforms/iss/console.c +++ b/arch/xtensa/platforms/iss/console.c @@ -69,11 +69,8 @@ static void rs_poll(unsigned long); static int rs_open(struct tty_struct *tty, struct file * filp) { spin_lock(&timer_lock); - if (tty->count == 1) { - init_timer(&serial_timer); - serial_timer.data = (unsigned long) tty; - serial_timer.function = rs_poll; + setup_timer(&serial_timer, rs_poll, (unsigned long)tty); mod_timer(&serial_timer, jiffies + SERIAL_TIMER_VALUE); } spin_unlock(&timer_lock); -- cgit v1.1