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

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

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

drivers/tty/serial/8250/8250_early.c

+4 −8
Original line number Diff line number Diff line
@@ -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)

{