Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[cascardo/linux.git] / drivers / tty / synclink_gt.c

diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index c0a2f5a..7aca2d4 100644 (file)
--- a/drivers/tty/synclink_gt.c
+++ b/drivers/tty/synclink_gt.c
@@ -726,7 +726,7 @@ static void close(struct tty_struct *tty, struct file *filp)
                goto cleanup;
 
        mutex_lock(&info->port.mutex);
-       if (info->port.flags & ASYNC_INITIALIZED)
+       if (tty_port_initialized(&info->port))
                wait_until_sent(tty, info->timeout);
        flush_buffer(tty);
        tty_ldisc_flush(tty);
@@ -756,9 +756,9 @@ static void hangup(struct tty_struct *tty)
 
        spin_lock_irqsave(&info->port.lock, flags);
        info->port.count = 0;
-       info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
        info->port.tty = NULL;
        spin_unlock_irqrestore(&info->port.lock, flags);
+       tty_port_set_active(&info->port, 0);
        mutex_unlock(&info->port.mutex);
 
        wake_up_interruptible(&info->port.open_wait);
@@ -784,7 +784,7 @@ static void set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        /* Handle transition away from B0 status */
        if (!(old_termios->c_cflag & CBAUD) && C_BAUD(tty)) {
                info->signals |= SerialSignal_DTR;
-               if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
+               if (!C_CRTSCTS(tty) || !tty_throttled(tty))
                        info->signals |= SerialSignal_RTS;
                spin_lock_irqsave(&info->lock,flags);
                set_signals(info);
@@ -893,7 +893,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
        if (sanity_check(info, tty->name, "wait_until_sent"))
                return;
        DBGINFO(("%s wait_until_sent entry\n", info->device_name));
-       if (!(info->port.flags & ASYNC_INITIALIZED))
+       if (!tty_port_initialized(&info->port))
                goto exit;
 
        orig_jiffies = jiffies;
@@ -1032,7 +1032,7 @@ static int ioctl(struct tty_struct *tty,
 
        if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
            (cmd != TIOCMIWAIT)) {
-               if (tty->flags & (1 << TTY_IO_ERROR))
+               if (tty_io_error(tty))
                    return -EIO;
        }
 
@@ -1493,7 +1493,7 @@ static netdev_tx_t hdlcdev_xmit(struct sk_buff *skb,
        dev->stats.tx_bytes += skb->len;
 
        /* save start time for transmit timeout detection */
-       dev->trans_start = jiffies;
+       netif_trans_update(dev);
 
        spin_lock_irqsave(&info->lock, flags);
        tx_load(info, skb->data, skb->len);
@@ -1552,7 +1552,7 @@ static int hdlcdev_open(struct net_device *dev)
        program_hw(info);
 
        /* enable network layer transmit */
-       dev->trans_start = jiffies;
+       netif_trans_update(dev);
        netif_start_queue(dev);
 
        /* inform generic HDLC layer of current DCD status */
@@ -2080,7 +2080,7 @@ static void dcd_change(struct slgt_info *info, unsigned short status)
        wake_up_interruptible(&info->event_wait_q);
        info->pending_bh |= BH_STATUS;
 
-       if (info->port.flags & ASYNC_CHECK_CD) {
+       if (tty_port_check_carrier(&info->port)) {
                if (info->signals & SerialSignal_DCD)
                        wake_up_interruptible(&info->port.open_wait);
                else {
@@ -2421,7 +2421,7 @@ static int startup(struct slgt_info *info)
 {
        DBGINFO(("%s startup\n", info->device_name));
 
-       if (info->port.flags & ASYNC_INITIALIZED)
+       if (tty_port_initialized(&info->port))
                return 0;
 
        if (!info->tx_buf) {
@@ -2442,7 +2442,7 @@ static int startup(struct slgt_info *info)
        if (info->port.tty)
                clear_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-       info->port.flags |= ASYNC_INITIALIZED;
+       tty_port_set_initialized(&info->port, 1);
 
        return 0;
 }
@@ -2454,7 +2454,7 @@ static void shutdown(struct slgt_info *info)
 {
        unsigned long flags;
 
-       if (!(info->port.flags & ASYNC_INITIALIZED))
+       if (!tty_port_initialized(&info->port))
                return;
 
        DBGINFO(("%s shutdown\n", info->device_name));
@@ -2489,7 +2489,7 @@ static void shutdown(struct slgt_info *info)
        if (info->port.tty)
                set_bit(TTY_IO_ERROR, &info->port.tty->flags);
 
-       info->port.flags &= ~ASYNC_INITIALIZED;
+       tty_port_set_initialized(&info->port, 0);
 }
 
 static void program_hw(struct slgt_info *info)
@@ -2576,15 +2576,8 @@ static void change_params(struct slgt_info *info)
        }
        info->timeout += HZ/50;         /* Add .02 seconds of slop */
 
-       if (cflag & CRTSCTS)
-               info->port.flags |= ASYNC_CTS_FLOW;
-       else
-               info->port.flags &= ~ASYNC_CTS_FLOW;
-
-       if (cflag & CLOCAL)
-               info->port.flags &= ~ASYNC_CHECK_CD;
-       else
-               info->port.flags |= ASYNC_CHECK_CD;
+       tty_port_set_cts_flow(&info->port, cflag & CRTSCTS);
+       tty_port_set_check_carrier(&info->port, ~cflag & CLOCAL);
 
        /* process tty input control flags */
 
@@ -3269,9 +3262,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
 
        DBGINFO(("%s block_til_ready\n", tty->driver->name));
 
-       if (filp->f_flags & O_NONBLOCK || tty->flags & (1 << TTY_IO_ERROR)){
+       if (filp->f_flags & O_NONBLOCK || tty_io_error(tty)) {
                /* nonblock mode is set or port is not enabled */
-               port->flags |= ASYNC_NORMAL_ACTIVE;
+               tty_port_set_active(port, 1);
                return 0;
        }
 
@@ -3294,12 +3287,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
        port->blocked_open++;
 
        while (1) {
-               if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags))
+               if (C_BAUD(tty) && tty_port_initialized(port))
                        tty_port_raise_dtr_rts(port);
 
                set_current_state(TASK_INTERRUPTIBLE);
 
-               if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)){
+               if (tty_hung_up_p(filp) || !tty_port_initialized(port)) {
                        retval = (port->flags & ASYNC_HUP_NOTIFY) ?
                                        -EAGAIN : -ERESTARTSYS;
                        break;
@@ -3328,7 +3321,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
        port->blocked_open--;
 
        if (!retval)
-               port->flags |= ASYNC_NORMAL_ACTIVE;
+               tty_port_set_active(port, 1);
 
        DBGINFO(("%s block_til_ready ready, rc=%d\n", tty->driver->name, retval));
        return retval;