Skip to content

Commit 6f5c24a

Browse files
Jiri Slabygregkh
authored andcommitted
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>
1 parent 303a7a1 commit 6f5c24a

File tree

1 file changed

+1
-24
lines changed

1 file changed

+1
-24
lines changed

drivers/tty/serial/serial_core.c

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1470,21 +1470,6 @@ static void uart_hangup(struct tty_struct *tty)
14701470
mutex_unlock(&port->mutex);
14711471
}
14721472

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-
*/
1483-
static void uart_update_termios(struct tty_struct *tty,
1484-
struct uart_state *state)
1485-
{
1486-
}
1487-
14881473
static int uart_carrier_raised(struct tty_port *port)
14891474
{
14901475
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)
15041489
struct uart_state *state = container_of(port, struct uart_state, port);
15051490
struct uart_port *uport = state->uart_port;
15061491

1507-
if (onoff) {
1492+
if (onoff)
15081493
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-
}
15171494
else
15181495
uart_clear_mctrl(uport, TIOCM_DTR | TIOCM_RTS);
15191496
}

0 commit comments

Comments
 (0)