Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5291ecc authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

serial: core: Fold __uart_put_char() into caller 



uart_put_char() is the required interface; manually inline
__uart_put_char().

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9db276f8

drivers/tty/serial/serial_core.c

+5 −9
Original line number Diff line number Diff line
@@ -483,12 +483,15 @@ static void uart_change_speed(struct tty_struct *tty, struct uart_state *state, 
	spin_unlock_irq(&uport->lock);

}



static inline int __uart_put_char(struct uart_port *port,

				struct circ_buf *circ, unsigned char c)

static int uart_put_char(struct tty_struct *tty, unsigned char c)

{

	struct uart_state *state = tty->driver_data;

	struct uart_port *port = state->uart_port;

	struct circ_buf *circ;

	unsigned long flags;

	int ret = 0;



	circ = &state->xmit;

	if (!circ->buf)

		return 0;
@@ -502,13 +505,6 @@ static inline int __uart_put_char(struct uart_port *port, 
	return ret;

}



static int uart_put_char(struct tty_struct *tty, unsigned char ch)

{

	struct uart_state *state = tty->driver_data;



	return __uart_put_char(state->uart_port, &state->xmit, ch);

}



static void uart_flush_chars(struct tty_struct *tty)

{

	uart_start(tty);