summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.masahiro@socionext.com>2015-10-30 02:39:03 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-12-14 03:59:48 (GMT)
commit2cda227bba7e8398c6f8a7792c7f35818187dcc6 (patch)
tree9d5a7d0a206b7c3f3ad987cf9cf883cb8347184d
parentc0f160a7355380e9b7f9c5cbb1a0f9eecf6ec601 (diff)
downloadlinux-2cda227bba7e8398c6f8a7792c7f35818187dcc6.tar.xz
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 <yamada.masahiro@socionext.com> Reviewed-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_early.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/tty/serial/8250/8250_early.c b/drivers/tty/serial/8250/8250_early.c
index ceb8579..5afc4d4 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)