tty: Use termios c_*flag macros

[deliverable/linux.git] / drivers / tty / synclinkmp.c

diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index fb00a06dfa4bba12e41f4dd42bd38e2c95d16ee4..4b314b63a2ed91442685619445c809b99b4d6e27 100644 (file)
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -871,8 +871,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        change_params(info);
 
        /* Handle transition to B0 status */
-       if (old_termios->c_cflag & CBAUD &&
-           !(tty->termios.c_cflag & CBAUD)) {
+       if ((old_termios->c_cflag & CBAUD) && !C_BAUD(tty)) {
                info->serial_signals &= ~(SerialSignal_RTS | SerialSignal_DTR);
                spin_lock_irqsave(&info->lock,flags);
                set_signals(info);
@@ -880,21 +879,17 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        }
 
        /* Handle transition away from B0 status */
-       if (!(old_termios->c_cflag & CBAUD) &&
-           tty->termios.c_cflag & CBAUD) {
+       if (!(old_termios->c_cflag & CBAUD) && C_BAUD(tty)) {
                info->serial_signals |= SerialSignal_DTR;
-               if (!(tty->termios.c_cflag & CRTSCTS) ||
-                   !test_bit(TTY_THROTTLED, &tty->flags)) {
+               if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
                        info->serial_signals |= SerialSignal_RTS;
-               }
                spin_lock_irqsave(&info->lock,flags);
                set_signals(info);
                spin_unlock_irqrestore(&info->lock,flags);
        }
 
        /* Handle turning off CRTSCTS */
-       if (old_termios->c_cflag & CRTSCTS &&
-           !(tty->termios.c_cflag & CRTSCTS)) {
+       if (old_termios->c_cflag & CRTSCTS && !C_CRTSCTS(tty)) {
                tty->hw_stopped = 0;
                tx_release(tty);
        }
@@ -1472,7 +1467,7 @@ static void throttle(struct tty_struct * tty)
        if (I_IXOFF(tty))
                send_xchar(tty, STOP_CHAR(tty));
 
-       if (tty->termios.c_cflag & CRTSCTS) {
+       if (C_CRTSCTS(tty)) {
                spin_lock_irqsave(&info->lock,flags);
                info->serial_signals &= ~SerialSignal_RTS;
                set_signals(info);
@@ -1501,7 +1496,7 @@ static void unthrottle(struct tty_struct * tty)
                        send_xchar(tty, START_CHAR(tty));
        }
 
-       if (tty->termios.c_cflag & CRTSCTS) {
+       if (C_CRTSCTS(tty)) {
                spin_lock_irqsave(&info->lock,flags);
                info->serial_signals |= SerialSignal_RTS;
                set_signals(info);
@@ -3297,7 +3292,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
                return 0;
        }
 
-       if (tty->termios.c_cflag & CLOCAL)
+       if (C_CLOCAL(tty))
                do_clocal = true;
 
        /* Wait for carrier detect and the line to become