redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

serial: core: Fold __uart_put_char() into caller 

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

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
hifive-unleashed-5.1
Peter Hurley 2016-01-10 20:23:55 -08:00 committed by Greg Kroah-Hartman
parent 9db276f8f0
commit f5291ecca1
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/tty/serial/serial_core.c
View File

@ -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);