TTY: serial, extract uart_port_startup

Extract ASYNC_INITIALIZED/TTY_IO_ERROR handling from uart_startup.
This will be useful for tty port helpers. These flags are handled
by the helpers instead.

So we create a new function uart_port_startup without touching these
flags there. And we keep uart_startup with the exact behavior as
before. We need that one because we start/stop the device from other
paths than open/close/hangup.

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 68763c0fa82c0976c4c2d7c3638301eb77ce6361..d2990f7386063ea29883c659d3eeed3232bb2f85 100644 (file)
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -131,24 +131,16 @@ uart_update_mctrl(struct uart_port *port, unsigned int set, unsigned int clear)
  * Startup the port.  This will be called once per open.  All calls
  * will be serialised by the per-port mutex.
  */
-static int uart_startup(struct tty_struct *tty, struct uart_state *state, int init_hw)
+static int uart_port_startup(struct tty_struct *tty, struct uart_state *state,
+               int init_hw)
 {
        struct uart_port *uport = state->uart_port;
        struct tty_port *port = &state->port;
        unsigned long page;
        int retval = 0;
 
-       if (port->flags & ASYNC_INITIALIZED)
-               return 0;
-
-       /*
-        * Set the TTY IO error marker - we will only clear this
-        * once we have successfully opened the port.
-        */
-       set_bit(TTY_IO_ERROR, &tty->flags);
-
        if (uport->type == PORT_UNKNOWN)
-               return 0;
+               return 1;
 
        /*
         * Initialise and allocate the transmit and temporary
@@ -190,10 +182,6 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
                                tty->hw_stopped = 1;
                        spin_unlock_irq(&uport->lock);
                }
-
-               set_bit(ASYNCB_INITIALIZED, &port->flags);
-
-               clear_bit(TTY_IO_ERROR, &tty->flags);
        }
 
        /*
@@ -202,6 +190,31 @@ static int uart_startup(struct tty_struct *tty, struct uart_state *state, int in
         * now.
         */
        if (retval && capable(CAP_SYS_ADMIN))
+               return 1;
+
+       return retval;
+}
+
+static int uart_startup(struct tty_struct *tty, struct uart_state *state,
+               int init_hw)
+{
+       struct tty_port *port = &state->port;
+       int retval;
+
+       if (port->flags & ASYNC_INITIALIZED)
+               return 0;
+
+       /*
+        * Set the TTY IO error marker - we will only clear this
+        * once we have successfully opened the port.
+        */
+       set_bit(TTY_IO_ERROR, &tty->flags);
+
+       retval = uart_port_startup(tty, state, init_hw);
+       if (!retval) {
+               set_bit(ASYNCB_INITIALIZED, &port->flags);
+               clear_bit(TTY_IO_ERROR, &tty->flags);
+       } else if (retval > 0)
                retval = 0;
 
        return retval;