tty: Use termios c_*flag macros

Expressions of the form "tty->termios.c_*flag & FLAG"
are more clearly expressed with the termios flags macros,
I_FLAG(), C_FLAG(), O_FLAG(), and L_FLAG().

Convert treewide.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Acked-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index a48e7e66b970..d67e542bab1c 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1440,7 +1440,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                         info->port.xmit_buf = NULL;
                         free_page((unsigned long)temp);
                 }
-                if (tty->termios.c_cflag & HUPCL)
+                if (C_HUPCL(tty))
                         cyy_change_rts_dtr(info, 0, TIOCM_RTS | TIOCM_DTR);
 
                 cyy_issue_cmd(info, CyCHAN_CTL | CyDIS_RCVR);
@@ -1469,7 +1469,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                         free_page((unsigned long)temp);
                 }
 
-                if (tty->termios.c_cflag & HUPCL)
+                if (C_HUPCL(tty))
                         tty_port_lower_dtr_rts(&info->port);
 
                 set_bit(TTY_IO_ERROR, &tty->flags);
@@ -2795,8 +2795,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 
         cy_set_line_char(info, tty);
 
-        if ((old_termios->c_cflag & CRTSCTS) &&
-                        !(tty->termios.c_cflag & CRTSCTS)) {
+        if ((old_termios->c_cflag & CRTSCTS) && !C_CRTSCTS(tty)) {
                 tty->hw_stopped = 0;
                 cy_start(tty);
         }
@@ -2807,8 +2806,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
          * XXX  It's not clear whether the current behavior is correct
          * or not.  Hence, this may change.....
          */
-        if (!(old_termios->c_cflag & CLOCAL) &&
-            (tty->termios.c_cflag & CLOCAL))
+        if (!(old_termios->c_cflag & CLOCAL) && C_CLOCAL(tty))
                 wake_up_interruptible(&info->port.open_wait);
 #endif
 }                               /* cy_set_termios */
@@ -2868,7 +2866,7 @@ static void cy_throttle(struct tty_struct *tty)
                         info->throttle = 1;
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (C_CRTSCTS(tty)) {
                 if (!cy_is_Z(card)) {
                         spin_lock_irqsave(&card->card_lock, flags);
                         cyy_change_rts_dtr(info, 0, TIOCM_RTS);
@@ -2905,7 +2903,7 @@ static void cy_unthrottle(struct tty_struct *tty)
                         cy_send_xchar(tty, START_CHAR(tty));
         }
 
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (C_CRTSCTS(tty)) {
                 card = info->card;
                 if (!cy_is_Z(card)) {
                         spin_lock_irqsave(&card->card_lock, flags);