summaryrefslogtreecommitdiffstats
path: root/arch/xtensa
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-03-05 14:52:05 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-03-08 11:47:01 -0800
commit86e7e874635ea76fee8608646afcb103414c6e72 (patch)
tree1179590084c56a3cd96fa24d0c3623cfb678b3df /arch/xtensa
parentac4e016df4bf57cdb100170c5cc057a15a9c96bd (diff)
downloadlinux-86e7e874635ea76fee8608646afcb103414c6e72.tar.gz
linux-86e7e874635ea76fee8608646afcb103414c6e72.tar.bz2
linux-86e7e874635ea76fee8608646afcb103414c6e72.zip
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>
Diffstat (limited to 'arch/xtensa')
-rw-r--r--arch/xtensa/platforms/iss/console.c5
1 files changed, 1 insertions, 4 deletions
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);