tty: Replace ASYNC_INITIALIZED bit and update atomically

Replace ASYNC_INITIALIZED bit in the tty_port::flags field with
TTY_PORT_INITIALIZED bit in the tty_port::iflags field. Introduce helpers
tty_port_set_initialized() and tty_port_initialized() to abstract
atomic bit ops.

Note: the transforms for test_and_set_bit() and test_and_clear_bit()
are unnecessary as the state transitions are already mutually exclusive;
the tty lock prevents concurrent open/close/hangup.

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

27 files changed, 157 insertions, 150 deletions

diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
index bf54f4e23b6f..345ca7c7ea74 100644
--- a/drivers/char/pcmcia/synclink_cs.c
+++ b/drivers/char/pcmcia/synclink_cs.c
@@ -1272,7 +1272,7 @@ static int startup(MGSLPC_INFO * info, struct tty_struct *tty)
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):startup(%s)\n", __FILE__, __LINE__, info->device_name);
 
-        if (info->port.flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(&info->port))
                 return 0;
 
         if (!info->tx_buf) {
@@ -1311,7 +1311,7 @@ static int startup(MGSLPC_INFO * info, struct tty_struct *tty)
         if (tty)
                 clear_bit(TTY_IO_ERROR, &tty->flags);
 
-        info->port.flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->port, 1);
 
         return 0;
 }
@@ -1322,7 +1322,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty)
 {
         unsigned long flags;
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -1361,7 +1361,7 @@ static void shutdown(MGSLPC_INFO * info, struct tty_struct *tty)
         if (tty)
                 set_bit(TTY_IO_ERROR, &tty->flags);
 
-        info->port.flags &= ~ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->port, 0);
 }
 
 static void mgslpc_program_hw(MGSLPC_INFO *info, struct tty_struct *tty)
@@ -2338,7 +2338,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
         if (tty_port_close_start(port, tty, filp) == 0)
                 goto cleanup;
 
-        if (port->flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(port))
                 mgslpc_wait_until_sent(tty, info->timeout);
 
         mgslpc_flush_buffer(tty);
@@ -2371,7 +2371,7 @@ static void mgslpc_wait_until_sent(struct tty_struct *tty, int timeout)
         if (mgslpc_paranoia_check(info, tty->name, "mgslpc_wait_until_sent"))
                 return;
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 goto exit;
 
         orig_jiffies = jiffies;
diff --git a/drivers/ipack/devices/ipoctal.c b/drivers/ipack/devices/ipoctal.c
index 035d5449227e..75dd15d66df6 100644
--- a/drivers/ipack/devices/ipoctal.c
+++ b/drivers/ipack/devices/ipoctal.c
@@ -629,8 +629,7 @@ static void ipoctal_hangup(struct tty_struct *tty)
         tty_port_hangup(&channel->tty_port);
 
         ipoctal_reset_channel(channel);
-
-        clear_bit(ASYNCB_INITIALIZED, &channel->tty_port.flags);
+        tty_port_set_initialized(&channel->tty_port, 0);
         wake_up_interruptible(&channel->tty_port.open_wait);
 }
 
@@ -642,7 +641,7 @@ static void ipoctal_shutdown(struct tty_struct *tty)
                 return;
 
         ipoctal_reset_channel(channel);
-        clear_bit(ASYNCB_INITIALIZED, &channel->tty_port.flags);
+        tty_port_set_initialized(&channel->tty_port, 0);
 }
 
 static void ipoctal_cleanup(struct tty_struct *tty)
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
index 023a350a8cd8..63eaa0a9f8a1 100644
--- a/drivers/isdn/i4l/isdn_tty.c
+++ b/drivers/isdn/i4l/isdn_tty.c
@@ -1049,7 +1049,7 @@ isdn_tty_change_speed(modem_info *info)
 static int
 isdn_tty_startup(modem_info *info)
 {
-        if (info->port.flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(&info->port))
                 return 0;
         isdn_lock_drivers();
 #ifdef ISDN_DEBUG_MODEM_OPEN
@@ -1066,7 +1066,7 @@ isdn_tty_startup(modem_info *info)
          */
         isdn_tty_change_speed(info);
 
-        info->port.flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->port, 1);
         info->msr |= (UART_MSR_DSR | UART_MSR_CTS);
         info->send_outstanding = 0;
         return 0;
@@ -1079,7 +1079,7 @@ isdn_tty_startup(modem_info *info)
 static void
 isdn_tty_shutdown(modem_info *info)
 {
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 return;
 #ifdef ISDN_DEBUG_MODEM_OPEN
         printk(KERN_DEBUG "Shutting down isdnmodem port %d ....\n", info->line);
@@ -1099,7 +1099,7 @@ isdn_tty_shutdown(modem_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);
 }
 
 /* isdn_tty_write() is the main send-routine. It is called from the upper
@@ -1577,7 +1577,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
          * interrupt driver to stop checking the data ready bit in the
          * line status register.
          */
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 tty_wait_until_sent(tty, 3000); /* 30 seconds timeout */
                 /*
                  * Before we drop DTR, make sure the UART transmitter
diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 114fe2845270..931d10e86837 100644
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -311,8 +311,7 @@ static void raw3215_timeout(unsigned long __data)
  */
 static inline void raw3215_try_io(struct raw3215_info *raw)
 {
-        if (!(raw->port.flags & ASYNC_INITIALIZED) ||
-            tty_port_suspended(&raw->port))
+        if (!tty_port_initialized(&raw->port) || tty_port_suspended(&raw->port))
                 return;
         if (raw->queued_read != NULL)
                 raw3215_start_io(raw);
@@ -616,10 +615,10 @@ static int raw3215_startup(struct raw3215_info *raw)
 {
         unsigned long flags;
 
-        if (raw->port.flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(&raw->port))
                 return 0;
         raw->line_pos = 0;
-        raw->port.flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(&raw->port, 1);
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
         raw3215_try_io(raw);
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
@@ -635,8 +634,7 @@ static void raw3215_shutdown(struct raw3215_info *raw)
         DECLARE_WAITQUEUE(wait, current);
         unsigned long flags;
 
-        if (!(raw->port.flags & ASYNC_INITIALIZED) ||
-            (raw->flags & RAW3215_FIXED))
+        if (!tty_port_initialized(&raw->port) || (raw->flags & RAW3215_FIXED))
                 return;
         /* Wait for outstanding requests, then free irq */
         spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
@@ -650,7 +648,7 @@ static void raw3215_shutdown(struct raw3215_info *raw)
                 spin_lock_irqsave(get_ccwdev_lock(raw->cdev), flags);
                 remove_wait_queue(&raw->empty_wait, &wait);
                 set_current_state(TASK_RUNNING);
-                raw->port.flags &= ~ASYNC_INITIALIZED;
+                tty_port_set_initialized(&raw->port, 1);
         }
         spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
 }
diff --git a/drivers/tty/amiserial.c b/drivers/tty/amiserial.c
index b4ab97d56351..208f573495dc 100644
--- a/drivers/tty/amiserial.c
+++ b/drivers/tty/amiserial.c
@@ -525,7 +525,7 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
 
         local_irq_save(flags);
 
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 free_page(page);
                 goto errout;
         }
@@ -586,7 +586,7 @@ static int startup(struct tty_struct *tty, struct serial_state *info)
          */
         change_speed(tty, info, NULL);
 
-        port->flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(port, 1);
         local_irq_restore(flags);
         return 0;
 
@@ -604,7 +604,7 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)
         unsigned long   flags;
         struct serial_state *state;
 
-        if (!(info->tport.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->tport))
                 return;
 
         state = info;
@@ -645,7 +645,7 @@ static void shutdown(struct tty_struct *tty, struct serial_state *info)
 
         set_bit(TTY_IO_ERROR, &tty->flags);
 
-        info->tport.flags &= ~ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->tport, 0);
         local_irq_restore(flags);
 }
 
@@ -1084,7 +1084,7 @@ static int set_serial_info(struct tty_struct *tty, struct serial_state *state,
         port->low_latency = (port->flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
 check_and_exit:
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 if (change_spd) {
                         if ((port->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)
                                 tty->alt_speed = 57600;
@@ -1390,7 +1390,7 @@ static void rs_close(struct tty_struct *tty, struct file * filp)
          * line status register.
          */
         state->read_status_mask &= ~UART_LSR_DR;
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 /* disable receive interrupts */
                 custom.intena = IF_RBF;
                 mb();
@@ -1538,7 +1538,7 @@ static inline void line_info(struct seq_file *m, int line,
 
         local_irq_save(flags);
         status = ciab.pra;
-        control = (state->tport.flags & ASYNC_INITIALIZED) ? state->MCR : status;
+        control = tty_port_initialized(&state->tport) ? state->MCR : status;
         local_irq_restore(flags);
 
         stat_buf[0] = 0;
diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
index 9d1e19ba25cb..3840d6b421c4 100644
--- a/drivers/tty/cyclades.c
+++ b/drivers/tty/cyclades.c
@@ -1279,7 +1279,7 @@ static int cy_startup(struct cyclades_port *info, struct tty_struct *tty)
 
         spin_lock_irqsave(&card->card_lock, flags);
 
-        if (info->port.flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(&info->port))
                 goto errout;
 
         if (!info->type) {
@@ -1364,7 +1364,7 @@ static int cy_startup(struct cyclades_port *info, struct tty_struct *tty)
                 /* enable send, recv, modem !!! */
         }
 
-        info->port.flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->port, 1);
 
         clear_bit(TTY_IO_ERROR, &tty->flags);
         info->xmit_cnt = info->xmit_head = info->xmit_tail = 0;
@@ -1424,7 +1424,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
         struct cyclades_card *card;
         unsigned long flags;
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 return;
 
         card = info->card;
@@ -1448,7 +1448,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                    some later date (after testing)!!! */
 
                 set_bit(TTY_IO_ERROR, &tty->flags);
-                info->port.flags &= ~ASYNC_INITIALIZED;
+                tty_port_set_initialized(&info->port, 0);
                 spin_unlock_irqrestore(&card->card_lock, flags);
         } else {
 #ifdef CY_DEBUG_OPEN
@@ -1473,7 +1473,7 @@ static void cy_shutdown(struct cyclades_port *info, struct tty_struct *tty)
                         tty_port_lower_dtr_rts(&info->port);
 
                 set_bit(TTY_IO_ERROR, &tty->flags);
-                info->port.flags &= ~ASYNC_INITIALIZED;
+                tty_port_set_initialized(&info->port, 0);
 
                 spin_unlock_irqrestore(&card->card_lock, flags);
         }
@@ -1711,7 +1711,7 @@ static void cy_do_close(struct tty_port *port)
                 /* Stop accepting input */
                 cyy_writeb(info, CyCAR, channel & 0x03);
                 cyy_writeb(info, CySRER, cyy_readb(info, CySRER) & ~CyRxData);
-                if (info->port.flags & ASYNC_INITIALIZED) {
+                if (tty_port_initialized(&info->port)) {
                         /* Waiting for on-board buffers to be empty before
                            closing the port */
                         spin_unlock_irqrestore(&card->card_lock, flags);
@@ -2334,7 +2334,7 @@ cy_set_serial_info(struct cyclades_port *info, struct tty_struct *tty,
         info->port.closing_wait = new_serial.closing_wait * HZ / 100;
 
 check_and_exit:
-        if (info->port.flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(&info->port)) {
                 cy_set_line_char(info, tty);
                 ret = 0;
         } else {
diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c
index 0b2bae1b2d55..b70187b46d9d 100644
--- a/drivers/tty/isicom.c
+++ b/drivers/tty/isicom.c
@@ -438,8 +438,8 @@ static void isicom_tx(unsigned long _data)
 
         for (; count > 0; count--, port++) {
                 /* port not active or tx disabled to force flow control */
-                if (!(port->port.flags & ASYNC_INITIALIZED) ||
-                                !(port->status & ISI_TXOK))
+                if (!tty_port_initialized(&port->port) ||
+                        !(port->status & ISI_TXOK))
                         continue;
 
                 txcount = min_t(short, TX_SIZE, port->xmit_cnt);
@@ -553,7 +553,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id)
                 return IRQ_HANDLED;
         }
         port = card->ports + channel;
-        if (!(port->port.flags & ASYNC_INITIALIZED)) {
+        if (!tty_port_initialized(&port->port)) {
                 outw(0x0000, base+0x04); /* enable interrupts */
                 spin_unlock(&card->card_lock);
                 return IRQ_HANDLED;
diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
index ce521d3f58cb..60d37b225589 100644
--- a/drivers/tty/moxa.c
+++ b/drivers/tty/moxa.c
@@ -912,7 +912,7 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
 
         /* pci hot-un-plug support */
         for (a = 0; a < brd->numPorts; a++)
-                if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
+                if (tty_port_initialized(&brd->ports[a].port))
                         tty_port_tty_hangup(&brd->ports[a].port, false);
 
         for (a = 0; a < MAX_PORTS_PER_BOARD; a++)
@@ -921,7 +921,7 @@ static void moxa_board_deinit(struct moxa_board_conf *brd)
         while (1) {
                 opened = 0;
                 for (a = 0; a < brd->numPorts; a++)
-                        if (brd->ports[a].port.flags & ASYNC_INITIALIZED)
+                        if (tty_port_initialized(&brd->ports[a].port))
                                 opened++;
                 mutex_unlock(&moxa_openlock);
                 if (!opened)
@@ -1192,13 +1192,13 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
         tty->driver_data = ch;
         tty_port_tty_set(&ch->port, tty);
         mutex_lock(&ch->port.mutex);
-        if (!(ch->port.flags & ASYNC_INITIALIZED)) {
+        if (!tty_port_initialized(&ch->port)) {
                 ch->statusflags = 0;
                 moxa_set_tty_param(tty, &tty->termios);
                 MoxaPortLineCtrl(ch, 1, 1);
                 MoxaPortEnable(ch);
                 MoxaSetFifo(ch, ch->type == PORT_16550A);
-                ch->port.flags |= ASYNC_INITIALIZED;
+                tty_port_set_initialized(&ch->port, 1);
         }
         mutex_unlock(&ch->port.mutex);
         mutex_unlock(&moxa_openlock);
@@ -1379,7 +1379,7 @@ static int moxa_poll_port(struct moxa_port *p, unsigned int handle,
 {
         struct tty_struct *tty = tty_port_tty_get(&p->port);
         void __iomem *ofsAddr;
-        unsigned int inited = p->port.flags & ASYNC_INITIALIZED;
+        unsigned int inited = tty_port_initialized(&p->port);
         u16 intr;
 
         if (tty) {
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index ab618ef3d171..7e8c27bf1ac8 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1081,12 +1081,10 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
         mutex_lock(&port->mutex);
         mxser_close_port(port);
         mxser_flush_buffer(tty);
-        if (test_bit(ASYNCB_INITIALIZED, &port->flags)) {
-                if (C_HUPCL(tty))
-                        tty_port_lower_dtr_rts(port);
-        }
+        if (tty_port_initialized(port) && C_HUPCL(tty))
+                tty_port_lower_dtr_rts(port);
         mxser_shutdown_port(port);
-        clear_bit(ASYNCB_INITIALIZED, &port->flags);
+        tty_port_set_initialized(port, 0);
         mutex_unlock(&port->mutex);
         info->closing = 0;
         /* Right now the tty_port set is done outside of the close_end helper
@@ -1282,7 +1280,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
 
         process_txrx_fifo(info);
 
-        if (test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (tty_port_initialized(port)) {
                 if (flags != (port->flags & ASYNC_SPD_MASK)) {
                         spin_lock_irqsave(&info->slock, sl_flags);
                         mxser_change_speed(tty, NULL);
@@ -1291,7 +1289,7 @@ static int mxser_set_serial_info(struct tty_struct *tty,
         } else {
                 retval = mxser_activate(port, tty);
                 if (retval == 0)
-                        set_bit(ASYNCB_INITIALIZED, &port->flags);
+                        tty_port_set_initialized(port, 1);
         }
         return retval;
 }
@@ -2251,7 +2249,7 @@ static irqreturn_t mxser_interrupt(int irq, void *dev_id)
                                 iir &= MOXA_MUST_IIR_MASK;
                                 tty = tty_port_tty_get(&port->port);
                                 if (!tty || port->closing ||
-                                    !(port->port.flags & ASYNC_INITIALIZED)) {
+                                    !tty_port_initialized(&port->port)) {
                                         status = inb(port->ioaddr + UART_LSR);
                                         outb(0x27, port->ioaddr + UART_FCR);
                                         inb(port->ioaddr + UART_MSR);
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
index 365dfd8bc42b..9f7a7bbff57d 100644
--- a/drivers/tty/n_gsm.c
+++ b/drivers/tty/n_gsm.c
@@ -2949,7 +2949,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
         dlci->modem_rx = 0;
         /* We could in theory open and close before we wait - eg if we get
            a DM straight back. This is ok as that will have caused a hangup */
-        set_bit(ASYNCB_INITIALIZED, &port->flags);
+        tty_port_set_initialized(port, 1);
         /* Start sending off SABM messages */
         gsm_dlci_begin_open(dlci);
         /* And wait for virtual carrier */
@@ -2972,10 +2972,8 @@ static void gsmtty_close(struct tty_struct *tty, struct file *filp)
         if (tty_port_close_start(&dlci->port, tty, filp) == 0)
                 return;
         gsm_dlci_begin_close(dlci);
-        if (test_bit(ASYNCB_INITIALIZED, &dlci->port.flags)) {
-                if (C_HUPCL(tty))
-                        tty_port_lower_dtr_rts(&dlci->port);
-        }
+        if (tty_port_initialized(&dlci->port) && C_HUPCL(tty))
+                tty_port_lower_dtr_rts(&dlci->port);
         tty_port_close_end(&dlci->port, tty);
         tty_port_tty_set(&dlci->port, NULL);
         return;
diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
index eb8311b20782..7f3b1db88061 100644
--- a/drivers/tty/rocket.c
+++ b/drivers/tty/rocket.c
@@ -495,7 +495,7 @@ static void rp_handle_port(struct r_port *info)
         if (!info)
                 return;
 
-        if ((info->port.flags & ASYNC_INITIALIZED) == 0) {
+        if (!tty_port_initialized(&info->port)) {
                 printk(KERN_WARNING "rp: WARNING: rp_handle_port called with "
                                 "info->flags & NOT_INIT\n");
                 return;
@@ -920,7 +920,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
         /*
          * Info->count is now 1; so it's safe to sleep now.
          */
-        if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (!tty_port_initialized(port)) {
                 cp = &info->channel;
                 sSetRxTrigger(cp, TRIG_1);
                 if (sGetChanStatus(cp) & CD_ACT)
@@ -944,7 +944,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
                 sEnRxFIFO(cp);
                 sEnTransmit(cp);
 
-                set_bit(ASYNCB_INITIALIZED, &info->port.flags);
+                tty_port_set_initialized(&info->port, 1);
 
                 /*
                  * Set up the tty->alt_speed kludge
@@ -1042,9 +1042,9 @@ static void rp_close(struct tty_struct *tty, struct file *filp)
                 }
         }
         spin_lock_irq(&port->lock);
-        port->flags &= ~ASYNC_INITIALIZED;
         tty->closing = 0;
         spin_unlock_irq(&port->lock);
+        tty_port_set_initialized(port, 0);
         tty_port_set_active(port, 0);
         mutex_unlock(&port->mutex);
         tty_port_tty_set(port, NULL);
@@ -1513,7 +1513,7 @@ static void rp_hangup(struct tty_struct *tty)
         sDisCTSFlowCtl(cp);
         sDisTxSoftFlowCtl(cp);
         sClrTxXOFF(cp);
-        clear_bit(ASYNCB_INITIALIZED, &info->port.flags);
+        tty_port_set_initialized(&info->port, 0);
 
         wake_up_interruptible(&info->port.open_wait);
 }
diff --git a/drivers/tty/serial/crisv10.c b/drivers/tty/serial/crisv10.c
index 92c8c628e00e..315c84979b18 100644
--- a/drivers/tty/serial/crisv10.c
+++ b/drivers/tty/serial/crisv10.c
@@ -2599,7 +2599,7 @@ startup(struct e100_serial * info)
 
         /* if it was already initialized, skip this */
 
-        if (info->port.flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(&info->port)) {
                 local_irq_restore(flags);
                 free_page(xmit_page);
                 return 0;
@@ -2703,7 +2703,7 @@ startup(struct e100_serial * info)
         e100_rts(info, 1);
         e100_dtr(info, 1);
 
-        info->port.flags |= ASYNC_INITIALIZED;
+        tty_port_set_initialized(&info->port, 1);
 
         local_irq_restore(flags);
         return 0;
@@ -2745,7 +2745,7 @@ shutdown(struct e100_serial * info)
                 info->tr_running = 0;
         }
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 return;
 
 #ifdef SERIAL_DEBUG_OPEN
@@ -2776,7 +2776,7 @@ shutdown(struct e100_serial * 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);
         local_irq_restore(flags);
 }
 
@@ -3273,9 +3273,9 @@ set_serial_info(struct e100_serial *info,
         info->port.low_latency = (info->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
 
  check_and_exit:
-        if (info->port.flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(&info->port))
                 change_speed(info);
-        } else
+        else
                 retval = startup(info);
         return retval;
 }
@@ -3628,7 +3628,7 @@ rs_close(struct tty_struct *tty, struct file * filp)
         e100_disable_rx(info);
         e100_disable_rx_irq(info);
 
-        if (info->port.flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(&info->port)) {
                 /*
                  * Before we drop DTR, make sure the UART transmitter
                  * has completely drained; this is especially
@@ -3787,8 +3787,7 @@ block_til_ready(struct tty_struct *tty, struct file * filp,
                 e100_dtr(info, 1);
                 local_irq_restore(flags);
                 set_current_state(TASK_INTERRUPTIBLE);
-                if (tty_hung_up_p(filp) ||
-                    !(info->port.flags & ASYNC_INITIALIZED)) {
+                if (tty_hung_up_p(filp) || !tty_port_initialized(&info->port)) {
 #ifdef SERIAL_DO_RESTART
                         if (info->port.flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 933606777f45..0c48051db172 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -196,7 +196,7 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state,
         struct tty_port *port = &state->port;
         int retval;
 
-        if (port->flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(port))
                 return 0;
 
         /*
@@ -207,7 +207,7 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state,
 
         retval = uart_port_startup(tty, state, init_hw);
         if (!retval) {
-                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                tty_port_set_initialized(port, 1);
                 clear_bit(TTY_IO_ERROR, &tty->flags);
         } else if (retval > 0)
                 retval = 0;
@@ -231,7 +231,9 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
         if (tty)
                 set_bit(TTY_IO_ERROR, &tty->flags);
 
-        if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (tty_port_initialized(port)) {
+                tty_port_set_initialized(port, 0);
+
                 /*
                  * Turn off DTR and RTS early.
                  */
@@ -886,7 +888,7 @@ static int uart_set_info(struct tty_struct *tty, struct tty_port *port,
         retval = 0;
         if (uport->type == PORT_UNKNOWN)
                 goto exit;
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 if (((old_flags ^ uport->flags) & UPF_SPD_MASK) ||
                     old_custom_divisor != uport->custom_divisor) {
                         /*
@@ -1390,7 +1392,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
          * At this point, we stop accepting input.  To do this, we
          * disable the receive line status interrupts.
          */
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 spin_lock_irq(&uport->lock);
                 uport->ops->stop_rx(uport);
                 spin_unlock_irq(&uport->lock);
@@ -2003,12 +2005,12 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *uport)
 
         uport->suspended = 1;
 
-        if (port->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(port)) {
                 const struct uart_ops *ops = uport->ops;
                 int tries;
 
                 tty_port_set_suspended(port, 1);
-                clear_bit(ASYNCB_INITIALIZED, &port->flags);
+                tty_port_set_initialized(port, 0);
 
                 spin_lock_irq(&uport->lock);
                 ops->stop_tx(uport);
@@ -2107,7 +2109,7 @@ int uart_resume_port(struct uart_driver *drv, struct uart_port *uport)
                                 ops->set_mctrl(uport, uport->mctrl);
                                 ops->start_tx(uport);
                                 spin_unlock_irq(&uport->lock);
-                                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                                tty_port_set_initialized(port, 1);
                         } else {
                                 /*
                                  * Failed to resume - maybe hardware went away?
@@ -2248,10 +2250,10 @@ static int uart_poll_init(struct tty_driver *driver, int line, char *options)
                 ret = 0;
                 mutex_lock(&tport->mutex);
                 /*
-                 * We don't set ASYNCB_INITIALIZED as we only initialized the
-                 * hw, e.g. state->xmit is still uninitialized.
+                 * We don't set initialized as we only initialized the hw,
+                 * e.g. state->xmit is still uninitialized.
                  */
-                if (!test_bit(ASYNCB_INITIALIZED, &tport->flags))
+                if (!tty_port_initialized(tport))
                         ret = port->ops->poll_init(port);
                 mutex_unlock(&tport->mutex);
                 if (ret)
diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
index b67b54a800bb..bc4bc1ff775e 100644
--- a/drivers/tty/synclink.c
+++ b/drivers/tty/synclink.c
@@ -1749,13 +1749,13 @@ static irqreturn_t mgsl_interrupt(int dummy, void *dev_id)
 static int startup(struct mgsl_struct * info)
 {
         int retval = 0;
-        
+
         if ( debug_level >= DEBUG_LEVEL_INFO )
                 printk("%s(%d):mgsl_startup(%s)\n",__FILE__,__LINE__,info->device_name);
-                
-        if (info->port.flags & ASYNC_INITIALIZED)
+
+        if (tty_port_initialized(&info->port))
                 return 0;
-        
+
         if (!info->xmit_buf) {
                 /* allocate a page of memory for a transmit buffer */
                 info->xmit_buf = (unsigned char *)get_zeroed_page(GFP_KERNEL);
@@ -1788,14 +1788,13 @@ static int startup(struct mgsl_struct * info)
 
         /* program hardware for current parameters */
         mgsl_change_params(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;
-        
 }       /* end of startup() */
 
 /* shutdown()
@@ -1808,8 +1807,8 @@ static int startup(struct mgsl_struct * info)
 static void shutdown(struct mgsl_struct * info)
 {
         unsigned long flags;
-        
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+
+        if (!tty_port_initialized(&info->port))
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -1853,13 +1852,12 @@ static void shutdown(struct mgsl_struct * info)
 
         spin_unlock_irqrestore(&info->irq_spinlock,flags);
 
-        mgsl_release_resources(info);   
-        
+        mgsl_release_resources(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);
 }       /* end of shutdown() */
 
 static void mgsl_program_hw(struct mgsl_struct *info)
@@ -3084,7 +3082,7 @@ static void mgsl_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))
                 mgsl_wait_until_sent(tty, info->timeout);
         mgsl_flush_buffer(tty);
         tty_ldisc_flush(tty);
@@ -3122,15 +3120,15 @@ static void mgsl_wait_until_sent(struct tty_struct *tty, int timeout)
         if (debug_level >= DEBUG_LEVEL_INFO)
                 printk("%s(%d):mgsl_wait_until_sent(%s) entry\n",
                          __FILE__,__LINE__, info->device_name );
-      
+
         if (mgsl_paranoia_check(info, tty->name, "mgsl_wait_until_sent"))
                 return;
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 goto exit;
-         
+
         orig_jiffies = jiffies;
-      
+
         /* Set check interval to 1/5 of estimated time to
          * send a character, and make it at least 1. The check
          * interval should also be less than the timeout.
@@ -3290,14 +3288,14 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
         port->count--;
         spin_unlock_irqrestore(&info->irq_spinlock, flags);
         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;
diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
index 333652a8896a..82c98b820335 100644
--- 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);
@@ -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;
@@ -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)
@@ -3287,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;
diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
index 17bab5f5b858..6dcfc2089373 100644
--- a/drivers/tty/synclinkmp.c
+++ b/drivers/tty/synclinkmp.c
@@ -812,7 +812,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);
@@ -1061,7 +1061,7 @@ static void wait_until_sent(struct tty_struct *tty, int timeout)
         if (sanity_check(info, tty->name, "wait_until_sent"))
                 return;
 
-        if (!test_bit(ASYNCB_INITIALIZED, &info->port.flags))
+        if (!tty_port_initialized(&info->port))
                 goto exit;
 
         orig_jiffies = jiffies;
@@ -2636,7 +2636,7 @@ static int startup(SLMP_INFO * info)
         if ( debug_level >= DEBUG_LEVEL_INFO )
                 printk("%s(%d):%s tx_releaseup()\n",__FILE__,__LINE__,info->device_name);
 
-        if (info->port.flags & ASYNC_INITIALIZED)
+        if (tty_port_initialized(&info->port))
                 return 0;
 
         if (!info->tx_buf) {
@@ -2662,7 +2662,7 @@ static int startup(SLMP_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;
 }
@@ -2673,7 +2673,7 @@ static void shutdown(SLMP_INFO * info)
 {
         unsigned long flags;
 
-        if (!(info->port.flags & ASYNC_INITIALIZED))
+        if (!tty_port_initialized(&info->port))
                 return;
 
         if (debug_level >= DEBUG_LEVEL_INFO)
@@ -2705,7 +2705,7 @@ static void shutdown(SLMP_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(SLMP_INFO *info)
@@ -3308,12 +3308,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;
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 130c8cf520cb..c3f9d93ba227 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -204,7 +204,8 @@ static void tty_port_shutdown(struct tty_port *port, struct tty_struct *tty)
         if (port->console)
                 goto out;
 
-        if (test_and_clear_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (tty_port_initialized(port)) {
+                tty_port_set_initialized(port, 0);
                 /*
                  * Drop DTR/RTS if HUPCL is set. This causes any attached
                  * modem to hang up the line.
@@ -393,13 +394,13 @@ int tty_port_block_til_ready(struct tty_port *port,
 
         while (1) {
                 /* Indicate we are open */
-                if (C_BAUD(tty) && test_bit(ASYNCB_INITIALIZED, &port->flags))
+                if (C_BAUD(tty) && tty_port_initialized(port))
                         tty_port_raise_dtr_rts(port);
 
                 prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE);
                 /* Check for a hangup or uninitialised port.
                                                         Return accordingly */
-                if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) {
+                if (tty_hung_up_p(filp) || !tty_port_initialized(port)) {
                         if (port->flags & ASYNC_HUP_NOTIFY)
                                 retval = -EAGAIN;
                         else
@@ -480,7 +481,7 @@ int tty_port_close_start(struct tty_port *port,
 
         tty->closing = 1;
 
-        if (test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (tty_port_initialized(port)) {
                 /* Don't block on a stalled port, just pull the chain */
                 if (tty->flow_stopped)
                         tty_driver_flush_buffer(tty);
@@ -578,7 +579,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
 
         mutex_lock(&port->mutex);
 
-        if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+        if (!tty_port_initialized(port)) {
                 clear_bit(TTY_IO_ERROR, &tty->flags);
                 if (port->ops->activate) {
                         int retval = port->ops->activate(port, tty);
@@ -587,7 +588,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
                                 return retval;
                         }
                 }
-                set_bit(ASYNCB_INITIALIZED, &port->flags);
+                tty_port_set_initialized(port, 1);
         }
         mutex_unlock(&port->mutex);
         return tty_port_block_til_ready(port, tty, filp);
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a6c4a1b895bd..94a14f5dc4d4 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1680,7 +1680,7 @@ static int acm_resume(struct usb_interface *intf)
         if (--acm->susp_count)
                 goto out;
 
-        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags)) {
+        if (tty_port_initialized(&acm->port)) {
                 rv = usb_submit_urb(acm->ctrlurb, GFP_ATOMIC);
 
                 for (;;) {
@@ -1710,7 +1710,7 @@ static int acm_reset_resume(struct usb_interface *intf)
 {
         struct acm *acm = usb_get_intfdata(intf);
 
-        if (test_bit(ASYNCB_INITIALIZED, &acm->port.flags))
+        if (tty_port_initialized(&acm->port))
                 tty_port_tty_hangup(&acm->port, false);
 
         return acm_resume(intf);
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index a66b01bb1fa1..8967715fe6fc 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -127,7 +127,7 @@ static int usb_console_setup(struct console *co, char *options)
         info->port = port;
 
         ++port->port.count;
-        if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
+        if (!tty_port_initialized(&port->port)) {
                 if (serial->type->set_termios) {
                         /*
                          * allocate a fake tty so the driver can initialize
@@ -168,7 +168,7 @@ static int usb_console_setup(struct console *co, char *options)
                         tty_port_tty_set(&port->port, NULL);
                         tty_kref_put(tty);
                 }
-                set_bit(ASYNCB_INITIALIZED, &port->port.flags);
+                tty_port_set_initialized(&port->port, 1);
         }
         /* Now that any required fake tty operations are completed restore
          * the tty port count */
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 54e170dd3dad..ae8c0365abd6 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -473,7 +473,7 @@ static bool usb_serial_generic_msr_changed(struct tty_struct *tty,
          * Use tty-port initialised flag to detect all hangups including the
          * one generated at USB-device disconnect.
          */
-        if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+        if (!tty_port_initialized(&port->port))
                 return true;
 
         spin_lock_irqsave(&port->lock, flags);
@@ -503,7 +503,7 @@ int usb_serial_generic_tiocmiwait(struct tty_struct *tty, unsigned long arg)
 
         ret = wait_event_interruptible(port->port.delta_msr_wait,
                         usb_serial_generic_msr_changed(tty, arg, &cnow));
-        if (!ret && !test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+        if (!ret && !tty_port_initialized(&port->port))
                 ret = -EIO;
 
         return ret;
@@ -606,7 +606,7 @@ int usb_serial_generic_resume(struct usb_serial *serial)
 
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
-                if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+                if (!tty_port_initialized(&port->port))
                         continue;
 
                 if (port->bulk_in_size) {
diff --git a/drivers/usb/serial/mxuport.c b/drivers/usb/serial/mxuport.c
index 31a8b47f1ac6..3722d6c1ba77 100644
--- a/drivers/usb/serial/mxuport.c
+++ b/drivers/usb/serial/mxuport.c
@@ -503,7 +503,7 @@ static void mxuport_process_read_urb_demux_data(struct urb *urb)
                         return;
                 }
 
-                if (test_bit(ASYNCB_INITIALIZED, &demux_port->port.flags)) {
+                if (tty_port_initialized(&demux_port->port)) {
                         ch = data + HEADER_SIZE;
                         mxuport_process_read_urb_data(demux_port, ch, rcv_len);
                 } else {
@@ -544,7 +544,7 @@ static void mxuport_process_read_urb_demux_event(struct urb *urb)
                 }
 
                 demux_port = serial->port[rcv_port];
-                if (test_bit(ASYNCB_INITIALIZED, &demux_port->port.flags)) {
+                if (tty_port_initialized(&demux_port->port)) {
                         ch = data + HEADER_SIZE;
                         rcv_event = get_unaligned_be16(data + 2);
                         mxuport_process_read_urb_event(demux_port, ch,
@@ -1339,7 +1339,7 @@ static int mxuport_resume(struct usb_serial *serial)
 
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
-                if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+                if (!tty_port_initialized(&port->port))
                         continue;
 
                 r = usb_serial_generic_write_start(port, GFP_NOIO);
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index 07d1ecd564f7..e1994e264cc0 100644
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -776,7 +776,7 @@ static void sierra_close(struct usb_serial_port *port)
 
         /*
          * Need to take susp_lock to make sure port is not already being
-         * resumed, but no need to hold it due to ASYNC_INITIALIZED.
+         * resumed, but no need to hold it due to initialized
          */
         spin_lock_irq(&intfdata->susp_lock);
         if (--intfdata->open_ports == 0)
@@ -1039,7 +1039,7 @@ static int sierra_resume(struct usb_serial *serial)
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
 
-                if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+                if (!tty_port_initialized(&port->port))
                         continue;
 
                 err = sierra_submit_delayed_urbs(port);
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 46f1f13b41f1..3f253aec0c16 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -254,7 +254,7 @@ static int serial_open(struct tty_struct *tty, struct file *filp)
  *
  * Shut down a USB serial port. Serialized against activate by the
  * tport mutex and kept to matching open/close pairs
- * of calls by the ASYNCB_INITIALIZED flag.
+ * of calls by the initialized flag.
  *
  * Not called if tty is console.
  */
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index be9cb61b4d19..3dfdfc81254b 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -464,7 +464,7 @@ void usb_wwan_close(struct usb_serial_port *port)
 
         /*
          * Need to take susp_lock to make sure port is not already being
-         * resumed, but no need to hold it due to ASYNC_INITIALIZED.
+         * resumed, but no need to hold it due to initialized
          */
         spin_lock_irq(&intfdata->susp_lock);
         if (--intfdata->open_ports == 0)
@@ -682,7 +682,7 @@ int usb_wwan_resume(struct usb_serial *serial)
         for (i = 0; i < serial->num_ports; i++) {
                 port = serial->port[i];
 
-                if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags))
+                if (!tty_port_initialized(&port->port))
                         continue;
 
                 portdata = usb_get_serial_port_data(port);
diff --git a/include/linux/tty.h b/include/linux/tty.h
index 7ac5add66c00..bf1bcdb01df0 100644
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
@@ -610,6 +610,19 @@ static inline void tty_port_set_suspended(struct tty_port *port, bool val)
                 clear_bit(TTY_PORT_SUSPENDED, &port->iflags);
 }
 
+static inline bool tty_port_initialized(struct tty_port *port)
+{
+        return test_bit(TTY_PORT_INITIALIZED, &port->iflags);
+}
+
+static inline void tty_port_set_initialized(struct tty_port *port, bool val)
+{
+        if (val)
+                set_bit(TTY_PORT_INITIALIZED, &port->iflags);
+        else
+                clear_bit(TTY_PORT_INITIALIZED, &port->iflags);
+}
+
 extern struct tty_struct *tty_port_tty_get(struct tty_port *port);
 extern void tty_port_tty_set(struct tty_port *port, struct tty_struct *tty);
 extern int tty_port_carrier_raised(struct tty_port *port);
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index 5b7ce599c709..873c4b707d6a 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -220,10 +220,11 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return -1;);
 
         /* Check if already open */
-        if (test_and_set_bit(ASYNCB_INITIALIZED, &self->port.flags)) {
+        if (tty_port_initialized(&self->port)) {
                 pr_debug("%s(), already open so break out!\n", __func__);
                 return 0;
         }
+        tty_port_set_initialized(&self->port, 1);
 
         /* Register with IrCOMM */
         irda_notify_init(&notify);
@@ -257,7 +258,7 @@ static int ircomm_tty_startup(struct ircomm_tty_cb *self)
 
         return 0;
 err:
-        clear_bit(ASYNCB_INITIALIZED, &self->port.flags);
+        tty_port_set_initialized(&self->port, 0);
         return ret;
 }
 
@@ -318,13 +319,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
         spin_unlock_irqrestore(&port->lock, flags);
 
         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) ||
-                    !test_bit(ASYNCB_INITIALIZED, &port->flags)) {
+                if (tty_hung_up_p(filp) || !tty_port_initialized(port)) {
                         retval = (port->flags & ASYNC_HUP_NOTIFY) ?
                                         -EAGAIN : -ERESTARTSYS;
                         break;
@@ -876,8 +876,9 @@ static void ircomm_tty_shutdown(struct ircomm_tty_cb *self)
         IRDA_ASSERT(self != NULL, return;);
         IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;);
 
-        if (!test_and_clear_bit(ASYNCB_INITIALIZED, &self->port.flags))
+        if (!tty_port_initialized(&self->port))
                 return;
+        tty_port_set_initialized(&self->port, 0);
 
         ircomm_tty_detach_cable(self);
 
@@ -1259,7 +1260,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
                 seq_printf(m, "%cASYNC_CHECK_CD", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(&self->port)) {
                 seq_printf(m, "%cASYNC_INITIALIZED", sep);
                 sep = '|';
         }
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index e24724db36a2..d4fdf8f7b471 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -324,7 +324,7 @@ static int ircomm_tty_set_serial_info(struct ircomm_tty_cb *self,
 
  check_and_exit:
 
-        if (self->flags & ASYNC_INITIALIZED) {
+        if (tty_port_initialized(self)) {
                 if (((old_state.flags & ASYNC_SPD_MASK) !=
                      (self->flags & ASYNC_SPD_MASK)) ||
                     (old_driver.custom_divisor != driver->custom_divisor)) {