diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2015-10-30 02:39:05 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-12-14 03:59:48 (GMT) |
| commit | 004e2ed5cc6d89201140ca96693bf9c0b2945f43 (patch) | |
| tree | 5cafc3068c3cef4c28ced32ebc3d668588150279 /drivers/tty/serial | |
| parent | f2bfdb0628d50339a70de475eb2be1c4c1eb9014 (diff) | |
| download | linux-004e2ed5cc6d89201140ca96693bf9c0b2945f43.tar.xz | |
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: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial')
| -rw-r--r-- | drivers/tty/serial/8250/8250_early.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c index 20ec27b..ca16195 100644 --- a/drivers/tty/serial/8250/8250_early.c +++ b/drivers/tty/serial/8250/8250_early.c @@ -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) -static void __init wait_for_xmitr(struct uart_port *port) +static void __init serial_putc(struct uart_port *port, int c) { unsigned int status; + serial8250_early_out(port, UART_TX, c); + for (;;) { status = serial8250_early_in(port, UART_LSR); if ((status & BOTH_EMPTY) == BOTH_EMPTY) - return; + break; 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, const char *s, unsigned int count) { |