Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ALPHA: srmcons, use timer functions

Browse source 
It makes the code more readable. We move the setup to the allocation
location because we need to initialize timers only once.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Matt Turner <mattst88@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2012-03-05 14:51:57 +01:00 committed by Greg Kroah-Hartman
parent 26b23209c0
commit 5e88e6c4e8
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/alpha/kernel/srmcons.c
View file

@ -79,10 +79,8 @@ srmcons_receive_chars(unsigned long data)
}
spin_lock(&srmconsp->lock);
if (srmconsp->tty) {
srmconsp->timer.expires = jiffies + incr;
add_timer(&srmconsp->timer);
}
if (srmconsp->tty)
mod_timer(&srmconsp->timer, jiffies + incr);
spin_unlock(&srmconsp->lock);
local_irq_restore(flags);
@ -172,7 +170,8 @@ srmcons_get_private_struct(struct srmcons_private **ps)
else {
srmconsp->tty = NULL;
spin_lock_init(&srmconsp->lock);
init_timer(&srmconsp->timer);
setup_timer(&srmconsp->timer, srmcons_receive_chars,
(unsigned long)srmconsp);
}
spin_unlock_irqrestore(&srmconsp_lock, flags);
@ -199,10 +198,7 @@ srmcons_open(struct tty_struct *tty, struct file *filp)
tty->driver_data = srmconsp;
srmconsp->tty = tty;
srmconsp->timer.function = srmcons_receive_chars;
srmconsp->timer.data = (unsigned long)srmconsp;
srmconsp->timer.expires = jiffies + 10;
add_timer(&srmconsp->timer);
mod_timer(&srmconsp->timer, jiffies + 10);
}
spin_unlock_irqrestore(&srmconsp->lock, flags);