From: Masahiro Yamada Date: Fri, 30 Oct 2015 02:39:03 +0000 (+0900) Subject: serial: 8250_early: do not save and restore IER in write callback X-Git-Tag: v4.5-rc1~123^2~70 X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=2cda227bba7e8398c6f8a7792c7f35818187dcc6;p=karo-tx-linux.git serial: 8250_early: do not save and restore IER in write callback The IER has already been masked in early_serial8250_setup(), there is no reason to save and restore it every time early_serial8250_write() is called. Signed-off-by: Masahiro Yamada Reviewed-by: Peter Hurley Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c index ceb85792a5cf..5afc4d440304 100644 --- a/drivers/tty/serial/8250/8250_early.c +++ b/drivers/tty/serial/8250/8250_early.c @@ -96,20 +96,11 @@ static void __init early_serial8250_write(struct console *console, { struct earlycon_device *device = console->data; struct uart_port *port = &device->port; - unsigned int ier; - - /* Save the IER and disable interrupts preserving the UUE bit */ - ier = serial8250_early_in(port, UART_IER); - if (ier) - serial8250_early_out(port, UART_IER, ier & UART_IER_UUE); uart_console_write(port, s, count, serial_putc); - /* Wait for transmitter to become empty and restore the IER */ + /* Wait for transmitter to become empty */ wait_for_xmitr(port); - - if (ier) - serial8250_early_out(port, UART_IER, ier); } static void __init init_port(struct earlycon_device *device)