lkml.org 
[lkml]   [2009]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/58] serial: cascade needless conditionals
    Date
    From: André Goddard Rosa <andre.goddard@gmail.com>

    Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/serial/serial_core.c | 12 +++++-------
    1 files changed, 5 insertions(+), 7 deletions(-)

    diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
    index 885eabe..047530b 100644
    --- a/drivers/serial/serial_core.c
    +++ b/drivers/serial/serial_core.c
    @@ -342,11 +342,11 @@ uart_get_baud_rate(struct uart_port *port, struct ktermios *termios,

    if (flags == UPF_SPD_HI)
    altbaud = 57600;
    - if (flags == UPF_SPD_VHI)
    + else if (flags == UPF_SPD_VHI)
    altbaud = 115200;
    - if (flags == UPF_SPD_SHI)
    + else if (flags == UPF_SPD_SHI)
    altbaud = 230400;
    - if (flags == UPF_SPD_WARP)
    + else if (flags == UPF_SPD_WARP)
    altbaud = 460800;

    for (try = 0; try < 2; try++) {
    @@ -1217,9 +1217,8 @@ static void uart_set_termios(struct tty_struct *tty,
    /* Handle transition to B0 status */
    if ((old_termios->c_cflag & CBAUD) && !(cflag & CBAUD))
    uart_clear_mctrl(state->uart_port, TIOCM_RTS | TIOCM_DTR);
    -
    /* Handle transition away from B0 status */
    - if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
    + else if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
    unsigned int mask = TIOCM_DTR;
    if (!(cflag & CRTSCTS) ||
    !test_bit(TTY_THROTTLED, &tty->flags))
    @@ -1234,9 +1233,8 @@ static void uart_set_termios(struct tty_struct *tty,
    __uart_start(tty);
    spin_unlock_irqrestore(&state->uart_port->lock, flags);
    }
    -
    /* Handle turning on CRTSCTS */
    - if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
    + else if (!(old_termios->c_cflag & CRTSCTS) && (cflag & CRTSCTS)) {
    spin_lock_irqsave(&state->uart_port->lock, flags);
    if (!(state->uart_port->ops->get_mctrl(state->uart_port) & TIOCM_CTS)) {
    tty->hw_stopped = 1;
    --
    1.6.5.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2009-12-12 00:39    [W:2.677 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site