tty: Flags should be accessed via the foo_bit interfaces

We have various drivers that poke around directly and we need to clean this
up before it causes problems.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/net/slip.c b/drivers/net/slip.c
index 25cec06d6dcc..8e1c0baf6958 100644
--- a/drivers/net/slip.c
+++ b/drivers/net/slip.c
@@ -401,7 +401,7 @@ static void sl_encaps(struct slip *sl, unsigned char *icp, int len)
          * if we did not request it before write operation.
          *       14 Oct 1994  Dmitry Gorodchanin.
          */
-        sl->tty->flags |= (1 << TTY_DO_WRITE_WAKEUP);
+        set_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
         actual = sl->tty->ops->write(sl->tty, sl->xbuff, count);
 #ifdef SL_CHECK_TRANSMIT
         sl->dev->trans_start = jiffies;
@@ -431,7 +431,7 @@ static void slip_write_wakeup(struct tty_struct *tty)
                 /* Now serial buffer is almost free & we can start
                  * transmission of another packet */
                 sl->tx_packets++;
-                tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &tty->flags);
                 sl_unlock(sl);
                 return;
         }
@@ -464,7 +464,7 @@ static void sl_tx_timeout(struct net_device *dev)
                         (tty_chars_in_buffer(sl->tty) || sl->xleft) ?
                                 "bad line quality" : "driver error");
                 sl->xleft = 0;
-                sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
                 sl_unlock(sl);
 #endif
         }
@@ -514,10 +514,9 @@ sl_close(struct net_device *dev)
         struct slip *sl = netdev_priv(dev);
 
         spin_lock_bh(&sl->lock);
-        if (sl->tty) {
+        if (sl->tty)
                 /* TTY discipline is running. */
-                sl->tty->flags &= ~(1 << TTY_DO_WRITE_WAKEUP);
-        }
+                clear_bit(TTY_DO_WRITE_WAKEUP, &sl->tty->flags);
         netif_stop_queue(dev);
         sl->rcount   = 0;
         sl->xleft    = 0;