1 files changed, 5 insertions, 10 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index a4237707f79d..da126ee6d218 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -287,14 +287,14 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
 
         if (filp->f_flags & O_NONBLOCK) {
                 /* nonblock mode is set */
-                if (tty->termios.c_cflag & CBAUD)
+                if (C_BAUD(tty))
                         tty_port_raise_dtr_rts(port);
                 port->flags |= ASYNC_NORMAL_ACTIVE;
                 pr_debug("%s(), O_NONBLOCK requested!\n", __func__);
                 return 0;
         }
 
-        if (tty->termios.c_cflag & CLOCAL) {
+        if (C_CLOCAL(tty)) {
                 pr_debug("%s(), doing CLOCAL!\n", __func__);
                 do_clocal = 1;
         }
@@ -806,7 +806,7 @@ static void ircomm_tty_throttle(struct tty_struct *tty)
                 ircomm_tty_send_xchar(tty, STOP_CHAR(tty));
 
         /* Hardware flow control? */
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (C_CRTSCTS(tty)) {
                 self->settings.dte &= ~IRCOMM_RTS;
                 self->settings.dte |= IRCOMM_DELTA_RTS;
 
@@ -831,12 +831,11 @@ static void ircomm_tty_unthrottle(struct tty_struct *tty)
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
         /* Using software flow control? */
-        if (I_IXOFF(tty)) {
+        if (I_IXOFF(tty))
                 ircomm_tty_send_xchar(tty, START_CHAR(tty));
-        }
 
         /* Using hardware flow control? */
-        if (tty->termios.c_cflag & CRTSCTS) {
+        if (C_CRTSCTS(tty)) {
                 self->settings.dte |= (IRCOMM_RTS|IRCOMM_DELTA_RTS);
 
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
@@ -1268,10 +1267,6 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
                 seq_printf(m, "%cASYNC_LOW_LATENCY", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_CLOSING) {
-                seq_printf(m, "%cASYNC_CLOSING", sep);
-                sep = '|';
-        }
         if (self->port.flags & ASYNC_NORMAL_ACTIVE) {
                 seq_printf(m, "%cASYNC_NORMAL_ACTIVE", sep);
                 sep = '|';