|
@@ -1470,21 +1470,6 @@ static void uart_hangup(struct tty_struct *tty)
|
|
|
mutex_unlock(&port->mutex);
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * uart_update_termios - update the terminal hw settings
|
|
|
- * @tty: tty associated with UART
|
|
|
- * @state: UART to update
|
|
|
- *
|
|
|
- * Copy across the serial console cflag setting into the termios settings
|
|
|
- * for the initial open of the port. This allows continuity between the
|
|
|
- * kernel settings, and the settings init adopts when it opens the port
|
|
|
- * for the first time.
|
|
|
- */
|
|
|
-static void uart_update_termios(struct tty_struct *tty,
|
|
|
- struct uart_state *state)
|
|
|
-{
|
|
|
-}
|
|
|
-
|
|
|
static int uart_carrier_raised(struct tty_port *port)
|
|
|
{
|
|
|
struct uart_state *state = container_of(port, struct uart_state, port);
|
|
@@ -1504,16 +1489,8 @@ static void uart_dtr_rts(struct tty_port *port, int onoff)
|
|
|
struct uart_state *state = container_of(port, struct uart_state, port);
|
|
|
struct uart_port *uport = state->uart_port;
|
|
|
|
|
|
- if (onoff) {
|
|
|
+ if (onoff)
|
|
|
uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
|
|
|
-
|
|
|
- /*
|
|
|
- * If this is the first open to succeed,
|
|
|
- * adjust things to suit.
|
|
|
- */
|
|
|
- if (!test_and_set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags))
|
|
|
- uart_update_termios(port->tty, state);
|
|
|
- }
|
|
|
else
|
|
|
uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
|
|
|
}
|