evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pty: Use spin_lock_irq() for pty_set_termios()

Browse source 
The tty driver's set_termios() method is called with interrupts
enabled; there is no need to save and restore the local interrupt state.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Hurley 2014-10-16 15:33:24 -04:00 • committed by Greg Kroah-Hartman
parent dbfcd851a9
commit 4d8c1dff6a
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/tty/pty.c
View file

@ -259,8 +259,6 @@ out:
static void pty_set_termios(struct tty_struct *tty, static void pty_set_termios(struct tty_struct *tty,
struct ktermios *old_termios) struct ktermios *old_termios)
{ {
unsigned long flags;
/* See if packet mode change of state. */ /* See if packet mode change of state. */
if (tty->link && tty->link->packet) { if (tty->link && tty->link->packet) {
int extproc = (old_termios->c_lflag & EXTPROC) | int extproc = (old_termios->c_lflag & EXTPROC) |
@ -272,7 +270,7 @@ static void pty_set_termios(struct tty_struct *tty,
STOP_CHAR(tty) == '\023' && STOP_CHAR(tty) == '\023' &&
START_CHAR(tty) == '\021'); START_CHAR(tty) == '\021');
if ((old_flow != new_flow) || extproc) { if ((old_flow != new_flow) || extproc) {
spin_lock_irqsave(&tty->ctrl_lock, flags); spin_lock_irq(&tty->ctrl_lock);
if (old_flow != new_flow) { if (old_flow != new_flow) {
tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP); tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);
if (new_flow) if (new_flow)
@ -282,7 +280,7 @@ static void pty_set_termios(struct tty_struct *tty,
} }
if (extproc) if (extproc)
tty->ctrl_status |= TIOCPKT_IOCTL; tty->ctrl_status |= TIOCPKT_IOCTL;
spin_unlock_irqrestore(&tty->ctrl_lock, flags); spin_unlock_irq(&tty->ctrl_lock);
wake_up_interruptible(&tty->link->read_wait); wake_up_interruptible(&tty->link->read_wait);
} }
} }