tty: Use termios c_*flag macros

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

diff --git a/drivers/tty/tty_ioctl.c b/drivers/tty/tty_ioctl.c
index 0ea351388724aeae75b70d22433b3d56736d1828..23bf5bb1d8bf74d01ea0a29b5ddb1e095e1855db 100644 (file)
--- a/drivers/tty/tty_ioctl.c
+++ b/drivers/tty/tty_ioctl.c
@@ -719,16 +719,16 @@ static int get_sgflags(struct tty_struct *tty)
 {
        int flags = 0;
 
-       if (!(tty->termios.c_lflag & ICANON)) {
-               if (tty->termios.c_lflag & ISIG)
+       if (!L_ICANON(tty)) {
+               if (L_ISIG(tty))
                        flags |= 0x02;          /* cbreak */
                else
                        flags |= 0x20;          /* raw */
        }
-       if (tty->termios.c_lflag & ECHO)
+       if (L_ECHO(tty))
                flags |= 0x08;                  /* echo */
-       if (tty->termios.c_oflag & OPOST)
-               if (tty->termios.c_oflag & ONLCR)
+       if (O_OPOST(tty))
+               if (O_ONLCR(tty))
                        flags |= 0x10;          /* crmod */
        return flags;
 }
@@ -908,7 +908,7 @@ static int tty_change_softcar(struct tty_struct *tty, int arg)
        tty->termios.c_cflag |= bit;
        if (tty->ops->set_termios)
                tty->ops->set_termios(tty, &old);
-       if ((tty->termios.c_cflag & CLOCAL) != bit)
+       if (C_CLOCAL(tty) != bit)
                ret = -EINVAL;
        up_write(&tty->termios_rwsem);
        return ret;