SERIAL: omap: simplify (2)
Simplify:
- set ECB
...
- LCR mode A
- clear TCRTLR
- LCR mode B
- clear ECB
- set ECB and update other bits
- LCR mode A
- update XONANY
to:
- set ECB
...
- LCR mode B
- set ECB and update other bits
- LCR mode A
- update XONANY and clear TCRTLR
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 0d2671e..156a854 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -924,11 +924,6 @@
}
if (up->port.flags & UPF_SOFT_FLOW) {
- /* Disable access to TCR/TLR */
- serial_out(up, UART_MCR, up->mcr);
- serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
- serial_out(up, UART_EFR, up->efr);
-
/* clear SW control mode bits */
up->efr &= OMAP_UART_SW_CLR;
@@ -948,9 +943,6 @@
if (termios->c_iflag & IXOFF)
up->efr |= OMAP_UART_SW_RX;
- serial_out(up, UART_EFR, up->efr | UART_EFR_ECB);
- serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
-
/*
* IXANY Flag:
* Enable any character to restart output.
@@ -962,7 +954,6 @@
else
up->mcr &= ~UART_MCR_XONANY;
}
-
serial_out(up, UART_MCR, up->mcr);
serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B);
serial_out(up, UART_EFR, up->efr);