lkml.org 
[lkml]   [2014]   [Sep]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 20/26] serial: core: Use spin_lock_irq() in uart_set_termios()
    Date
    uart_set_termios() is called with interrupts enabled; no need to
    save and restore the interrupt state when taking the uart port lock.

    Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
    ---
    drivers/tty/serial/serial_core.c | 9 ++++-----
    1 file changed, 4 insertions(+), 5 deletions(-)

    diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
    index 95277a2..200fa8c 100644
    --- a/drivers/tty/serial/serial_core.c
    +++ b/drivers/tty/serial/serial_core.c
    @@ -1244,7 +1244,6 @@ static void uart_set_termios(struct tty_struct *tty,
    {
    struct uart_state *state = tty->driver_data;
    struct uart_port *uport = state->uart_port;
    - unsigned long flags;
    unsigned int cflag = tty->termios.c_cflag;
    unsigned int iflag_mask = IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK;
    bool sw_changed = false;
    @@ -1298,19 +1297,19 @@ static void uart_set_termios(struct tty_struct *tty,

    /* Handle turning off CRTSCTS */
    if ((old_termios->c_cflag & CRTSCTS) && !(cflag & CRTSCTS)) {
    - spin_lock_irqsave(&uport->lock, flags);
    + spin_lock_irq(&uport->lock);
    uport->hw_stopped = 0;
    __uart_start(tty);
    - spin_unlock_irqrestore(&uport->lock, flags);
    + spin_unlock_irq(&uport->lock);
    }
    /* Handle turning on CRTSCTS */
    else if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
    - spin_lock_irqsave(&uport->lock, flags);
    + spin_lock_irq(&uport->lock);
    if (!(uport->ops->get_mctrl(uport) & TIOCM_CTS)) {
    uport->hw_stopped = 1;
    uport->ops->stop_tx(uport);
    }
    - spin_unlock_irqrestore(&uport->lock, flags);
    + spin_unlock_irq(&uport->lock);
    }
    }

    --
    2.1.0


    \
     
     \ /
      Last update: 2014-09-03 00:41    [W:4.149 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site