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>

1 files changed, 6 insertions, 6 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;