diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2014-10-16 21:33:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-06 01:34:36 +0100 |
| commit | 4d8c1dff6a8666a2e18a7d5954c2156be0d5b152 (patch) | |
| tree | 67b087c8fb4142ad6d95b9a9e8d085ad8ace6ee6 /drivers/tty/pty.c | |
| parent | tty: Move pty-specific set_termios() handling to pty driver (diff) | |
| download | linux-4d8c1dff6a8666a2e18a7d5954c2156be0d5b152.tar.xz linux-4d8c1dff6a8666a2e18a7d5954c2156be0d5b152.zip | |
pty: Use spin_lock_irq() for pty_set_termios()
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>
Diffstat (limited to 'drivers/tty/pty.c')
| -rw-r--r-- | drivers/tty/pty.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 7f612c524224..394374789292 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -259,8 +259,6 @@ out: static void pty_set_termios(struct tty_struct *tty, struct ktermios *old_termios) { - unsigned long flags; - /* See if packet mode change of state. */ if (tty->link && tty->link->packet) { int extproc = (old_termios->c_lflag & EXTPROC) | @@ -272,7 +270,7 @@ static void pty_set_termios(struct tty_struct *tty, STOP_CHAR(tty) == '\023' && START_CHAR(tty) == '\021'); if ((old_flow != new_flow) || extproc) { - spin_lock_irqsave(&tty->ctrl_lock, flags); + spin_lock_irq(&tty->ctrl_lock); if (old_flow != new_flow) { tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP); if (new_flow) @@ -282,7 +280,7 @@ static void pty_set_termios(struct tty_struct *tty, } if (extproc) 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); } } |