Merge tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty and serial driver updates from Greg KH:
 "Here's the large TTY and Serial driver update for 4.7-rc1.

  A few new serial drivers are added here, and Peter has fixed a bunch
  of long-standing bugs in the tty layer and serial drivers as normal.
  Full details in the shortlog.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (88 commits)
  MAINTAINERS: 8250: remove website reference
  serial: core: Fix port mutex assert if lockdep disabled
  serial: 8250_dw: fix wrong logic in dw8250_check_lcr()
  tty: vt, finish looping on duplicate
  tty: vt, return error when con_startup fails
  QE-UART: add "fsl,t1040-ucc-uart" to of_device_id
  serial: mctrl_gpio: Drop support for out1-gpios and out2-gpios
  serial: 8250dw: Add device HID for future AMD UART controller
  Fix OpenSSH pty regression on close
  serial: mctrl_gpio: add IRQ locking
  serial: 8250: Integrate Fintek into 8250_base
  serial: mps2-uart: add support for early console
  serial: mps2-uart: add MPS2 UART driver
  dt-bindings: document the MPS2 UART bindings
  serial: sirf: Use generic uart-has-rtscts DT property
  serial: sirf: Introduce helper variable struct device_node *np
  serial: mxs-auart: Use generic uart-has-rtscts DT property
  serial: imx: Use generic uart-has-rtscts DT property
  doc: DT: Add Generic Serial Device Tree Bindings
  serial: 8250: of: Make tegra_serial_handle_break() static
  ...

3 files changed, 24 insertions, 27 deletions

diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index da126ee6d218..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;
 }
 
@@ -280,8 +281,8 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
          * If non-blocking mode is set, or the port is not enabled,
          * then make the check up front and then exit.
          */
-        if (test_bit(TTY_IO_ERROR, &tty->flags)) {
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+        if (tty_io_error(tty)) {
+                tty_port_set_active(port, 1);
                 return 0;
         }
 
@@ -289,7 +290,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                 /* nonblock mode is set */
                 if (C_BAUD(tty))
                         tty_port_raise_dtr_rts(port);
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                tty_port_set_active(port, 1);
                 pr_debug("%s(), O_NONBLOCK requested!\n", __func__);
                 return 0;
         }
@@ -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;
@@ -365,7 +365,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
                  __FILE__, __LINE__, tty->driver->name, port->count);
 
         if (!retval)
-                port->flags |= ASYNC_NORMAL_ACTIVE;
+                tty_port_set_active(port, 1);
 
         return retval;
 }
@@ -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);
 
@@ -925,7 +926,6 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
         ircomm_tty_shutdown(self);
 
         spin_lock_irqsave(&port->lock, flags);
-        port->flags &= ~ASYNC_NORMAL_ACTIVE;
         if (port->tty) {
                 set_bit(TTY_IO_ERROR, &port->tty->flags);
                 tty_kref_put(port->tty);
@@ -933,6 +933,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
         port->tty = NULL;
         port->count = 0;
         spin_unlock_irqrestore(&port->lock, flags);
+        tty_port_set_active(port, 0);
 
         wake_up_interruptible(&port->open_wait);
 }
@@ -999,7 +1000,7 @@ void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self)
         if (status & IRCOMM_DCE_DELTA_ANY) {
                 /*wake_up_interruptible(&self->delta_msr_wait);*/
         }
-        if ((self->port.flags & ASYNC_CHECK_CD) && (status & IRCOMM_DELTA_CD)) {
+        if (tty_port_check_carrier(&self->port) && (status & IRCOMM_DELTA_CD)) {
                 pr_debug("%s(), ircomm%d CD now %s...\n", __func__ , self->line,
                          (status & IRCOMM_CD) ? "on" : "off");
 
@@ -1255,11 +1256,11 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
                 seq_printf(m, "%cASYNC_CTS_FLOW", sep);
                 sep = '|';
         }
-        if (self->port.flags & ASYNC_CHECK_CD) {
+        if (tty_port_check_carrier(&self->port)) {
                 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 = '|';
         }
@@ -1267,7 +1268,7 @@ 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_NORMAL_ACTIVE) {
+        if (tty_port_active(&self->port)) {
                 seq_printf(m, "%cASYNC_NORMAL_ACTIVE", sep);
                 sep = '|';
         }
diff --git a/net/irda/ircomm/ircomm_tty_attach.c b/net/irda/ircomm/ircomm_tty_attach.c
index 61137f8b5293..0a411019c098 100644
--- a/net/irda/ircomm/ircomm_tty_attach.c
+++ b/net/irda/ircomm/ircomm_tty_attach.c
@@ -968,7 +968,7 @@ static int ircomm_tty_state_ready(struct ircomm_tty_cb *self,
                 ircomm_tty_next_state(self, IRCOMM_TTY_SEARCH);
                 ircomm_tty_start_watchdog_timer(self, 3*HZ);
 
-                if (self->port.flags & ASYNC_CHECK_CD) {
+                if (tty_port_check_carrier(&self->port)) {
                         /* Drop carrier */
                         self->settings.dce = IRCOMM_DELTA_CD;
                         ircomm_tty_check_modem_status(self);
diff --git a/net/irda/ircomm/ircomm_tty_ioctl.c b/net/irda/ircomm/ircomm_tty_ioctl.c
index d3687aaa23de..d4fdf8f7b471 100644
--- a/net/irda/ircomm/ircomm_tty_ioctl.c
+++ b/net/irda/ircomm/ircomm_tty_ioctl.c
@@ -86,21 +86,17 @@ static void ircomm_tty_change_speed(struct ircomm_tty_cb *self,
         ircomm_param_request(self, IRCOMM_DATA_RATE, FALSE);
 
         /* CTS flow control flag and modem status interrupts */
+        tty_port_set_cts_flow(&self->port, cflag & CRTSCTS);
         if (cflag & CRTSCTS) {
-                self->port.flags |= ASYNC_CTS_FLOW;
                 self->settings.flow_control |= IRCOMM_RTS_CTS_IN;
                 /* This got me. Bummer. Jean II */
                 if (self->service_type == IRCOMM_3_WIRE_RAW)
                         net_warn_ratelimited("%s(), enabling RTS/CTS on link that doesn't support it (3-wire-raw)\n",
                                              __func__);
         } else {
-                self->port.flags &= ~ASYNC_CTS_FLOW;
                 self->settings.flow_control &= ~IRCOMM_RTS_CTS_IN;
         }
-        if (cflag & CLOCAL)
-                self->port.flags &= ~ASYNC_CHECK_CD;
-        else
-                self->port.flags |= ASYNC_CHECK_CD;
+        tty_port_set_check_carrier(&self->port, ~cflag & CLOCAL);
 #if 0
         /*
          * Set up parity check flag
@@ -166,7 +162,7 @@ void ircomm_tty_set_termios(struct tty_struct *tty,
         /* Handle transition away from B0 status */
         if (!(old_termios->c_cflag & CBAUD) && (cflag & CBAUD)) {
                 self->settings.dte |= IRCOMM_DTR;
-                if (!C_CRTSCTS(tty) || !test_bit(TTY_THROTTLED, &tty->flags))
+                if (!C_CRTSCTS(tty) || !tty_throttled(tty))
                         self->settings.dte |= IRCOMM_RTS;
                 ircomm_param_request(self, IRCOMM_DTE, TRUE);
         }
@@ -190,7 +186,7 @@ int ircomm_tty_tiocmget(struct tty_struct *tty)
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
         unsigned int result;
 
-        if (tty->flags & (1 << TTY_IO_ERROR))
+        if (tty_io_error(tty))
                 return -EIO;
 
         result =  ((self->settings.dte & IRCOMM_RTS) ? TIOCM_RTS : 0)
@@ -213,7 +209,7 @@ int ircomm_tty_tiocmset(struct tty_struct *tty,
 {
         struct ircomm_tty_cb *self = (struct ircomm_tty_cb *) tty->driver_data;
 
-        if (tty->flags & (1 << TTY_IO_ERROR))
+        if (tty_io_error(tty))
                 return -EIO;
 
         IRDA_ASSERT(self != NULL, return -1;);
@@ -328,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)) {
@@ -362,7 +358,7 @@ int ircomm_tty_ioctl(struct tty_struct *tty,
         if ((cmd != TIOCGSERIAL) && (cmd != TIOCSSERIAL) &&
             (cmd != TIOCSERCONFIG) && (cmd != TIOCSERGSTRUCT) &&
             (cmd != TIOCMIWAIT) && (cmd != TIOCGICOUNT)) {
-                if (tty->flags & (1 << TTY_IO_ERROR))
+                if (tty_io_error(tty))
                     return -EIO;
         }