From: Jiri Slaby <jslaby@suse.cz>
Date: Mon, 5 Mar 2012 13:52:05 +0000 (+0100)
Subject: XTENSA: iss/console, use setup_timer
X-Git-Tag: MMI-PSA29.97-13-9~17267^2~74
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=86e7e874635ea76fee8608646afcb103414c6e72;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

XTENSA: iss/console, use setup_timer

Use setup_timer instead of explicit assignments.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c
index 19a802a13096..01842e4d1904 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);