diff options
| author | Jiri Slaby <jslaby@suse.cz> | 2012-03-05 14:52:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-08 11:47:01 -0800 |
| commit | 86e7e874635ea76fee8608646afcb103414c6e72 (patch) | |
| tree | 1179590084c56a3cd96fa24d0c3623cfb678b3df | |
| parent | ac4e016df4bf57cdb100170c5cc057a15a9c96bd (diff) | |
| download | linux-3.10-86e7e874635ea76fee8608646afcb103414c6e72.tar.gz linux-3.10-86e7e874635ea76fee8608646afcb103414c6e72.tar.bz2 linux-3.10-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>
| -rw-r--r-- | arch/xtensa/platforms/iss/console.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/xtensa/platforms/iss/console.c b/arch/xtensa/platforms/iss/console.c index 19a802a1309..01842e4d190 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); |