XTENSA: iss/console, use setup_timer

Use setup_timer instead of explicit assignments.

Signed-off-by: Jiri Slaby <[email protected]>
Cc: Chris Zankel <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 19a802a13096e8e3c0fe290e1bdce59ce980dab0..01842e4d190403398dd6f4baf7b3ad7c50d8505d 100644 (file)
--- 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);