aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2011-03-29 18:10:57 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-19 19:32:20 -0400
commit6f5c24ad0f7619502199185a026a228174a27e68 (patch)
tree69166123a54f9ca8b28437520e91727b4fa34a06 /drivers/tty/serial
parent303a7a1199c20f7c9452f024a6e17bf348b6b398 (diff)
serial: core, remove uart_update_termios
Now, uart_update_termios is empty, so it's time to remove it. We no longer need a live tty in .dtr_rts. So this should prune all the bugs where tty is zeroed in port->tty during tty_port_block_til_ready. There is one thing to note. We don't set ASYNC_NORMAL_ACTIVE now. It's because this is done already in tty_port_block_til_ready. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/serial_core.c25
1 files changed, 1 insertions, 24 deletions
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index 3aae8ed2a8f5..d4bd465c4c41 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -1470,21 +1470,6 @@ static void uart_hangup(struct tty_struct *tty)
1470 mutex_unlock(&port->mutex); 1470 mutex_unlock(&port->mutex);
1471} 1471}
1472 1472
1473/**
1474 * uart_update_termios - update the terminal hw settings
1475 * @tty: tty associated with UART
1476 * @state: UART to update
1477 *
1478 * Copy across the serial console cflag setting into the termios settings
1479 * for the initial open of the port. This allows continuity between the
1480 * kernel settings, and the settings init adopts when it opens the port
1481 * for the first time.
1482 */
1483static void uart_update_termios(struct tty_struct *tty,
1484 struct uart_state *state)
1485{
1486}
1487
1488static int uart_carrier_raised(struct tty_port *port) 1473static int uart_carrier_raised(struct tty_port *port)
1489{ 1474{
1490 struct uart_state *state = container_of(port, struct uart_state, port); 1475 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)
1504 struct uart_state *state = container_of(port, struct uart_state, port); 1489 struct uart_state *state = container_of(port, struct uart_state, port);
1505 struct uart_port *uport = state->uart_port; 1490 struct uart_port *uport = state->uart_port;
1506 1491
1507 if (onoff) { 1492 if (onoff)
1508 uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS); 1493 uart_set_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
1509
1510 /*
1511 * If this is the first open to succeed,
1512 * adjust things to suit.
1513 */
1514 if (!test_and_set_bit(ASYNCB_NORMAL_ACTIVE, &port->flags))
1515 uart_update_termios(port->tty, state);
1516 }
1517 else 1494 else
1518 uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS); 1495 uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
1519} 1496}