TTY: serial, fill uart_port_shutdown

Let's fill the port_ops->shutdown. We will need this for hangup and
close port helpers.

We don't need to touch DTR/RTS registers in uart_port_shutdown. They
are set to off from port_close_start properly already.

Also we don't need to pin the TTY_IO_ERROR bit. This will be done in
close/hangup paths.

We leave uart_shutdown as is, because it is used (and will be) from
several paths now. Like from suspend.

The point is to not touch ASYNC_INITIALIZED bit. It will be set (and
checked) properly by the tty port helpers.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index d7e8a5e..68763c0 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -61,6 +61,8 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
 static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
 static void uart_change_pm(struct uart_state *state, int pm_state);
 
+static void uart_port_shutdown(struct tty_port *port);
+
 /*
  * This routine is used by the interrupt handler to schedule processing in
  * the software interrupt portion of the driver.
@@ -228,24 +230,7 @@ static void uart_shutdown(struct tty_struct *tty, struct uart_state *state)
                if (!tty || (tty->termios->c_cflag & HUPCL))
                        uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
 
-               /*
-                * clear delta_msr_wait queue to avoid mem leaks: we may free
-                * the irq here so the queue might never be woken up.  Note
-                * that we won't end up waiting on delta_msr_wait again since
-                * any outstanding file descriptors should be pointing at
-                * hung_up_tty_fops now.
-                */
-               wake_up_interruptible(&port->delta_msr_wait);
-
-               /*
-                * Free the IRQ and disable the port.
-                */
-               uport->ops->shutdown(uport);
-
-               /*
-                * Ensure that the IRQ handler isn't running on another CPU.
-                */
-               synchronize_irq(uport->irq);
+               uart_port_shutdown(port);
        }
 
        /*
@@ -1411,6 +1396,27 @@ static int uart_port_activate(struct tty_port *port, struct tty_struct *tty)
 
 static void uart_port_shutdown(struct tty_port *port)
 {
+       struct uart_state *state = container_of(port, struct uart_state, port);
+       struct uart_port *uport = state->uart_port;
+
+       /*
+        * clear delta_msr_wait queue to avoid mem leaks: we may free
+        * the irq here so the queue might never be woken up.  Note
+        * that we won't end up waiting on delta_msr_wait again since
+        * any outstanding file descriptors should be pointing at
+        * hung_up_tty_fops now.
+        */
+       wake_up_interruptible(&port->delta_msr_wait);
+
+       /*
+        * Free the IRQ and disable the port.
+        */
+       uport->ops->shutdown(uport);
+
+       /*
+        * Ensure that the IRQ handler isn't running on another CPU.
+        */
+       synchronize_irq(uport->irq);
 }
 
 static int uart_carrier_raised(struct tty_port *port)