Commit 6f5c24ad authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

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: default avatarJiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 303a7a11

drivers/tty/serial/serial_core.c

+1 −24
Original line number Diff line number Diff line
@@ -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);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE