Commit 004e2ed5 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman

serial: 8250_early: squash wait_for_xmitr() into serial_putc()

Now, wait_for_xmitr() is only called from serial_putc(), and both
are short enough.  They can be merged into a single function.
Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f2bfdb06
...@@ -73,24 +73,20 @@ static void __init serial8250_early_out(struct uart_port *port, int offset, int ...@@ -73,24 +73,20 @@ static void __init serial8250_early_out(struct uart_port *port, int offset, int
#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
static void __init wait_for_xmitr(struct uart_port *port) static void __init serial_putc(struct uart_port *port, int c)
{ {
unsigned int status; unsigned int status;
serial8250_early_out(port, UART_TX, c);
for (;;) { for (;;) {
status = serial8250_early_in(port, UART_LSR); status = serial8250_early_in(port, UART_LSR);
if ((status & BOTH_EMPTY) == BOTH_EMPTY) if ((status & BOTH_EMPTY) == BOTH_EMPTY)
return; break;
cpu_relax(); cpu_relax();
} }
} }
static void __init serial_putc(struct uart_port *port, int c)
{
serial8250_early_out(port, UART_TX, c);
wait_for_xmitr(port);
}
static void __init early_serial8250_write(struct console *console, static void __init early_serial8250_write(struct console *console,
const char *s, unsigned int count) const char *s, unsigned int count)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment