aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorHuang Shijie <b32955@freescale.com>2014-05-20 21:09:47 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-28 15:40:43 -0400
commit8eccd0cd2106fbe0acc6bec3701e69e171353f25 (patch)
tree69e88314befcf4ad5ff6821318a7883d9e346ce6 /drivers/tty
parent772f89910a8a1d1dd9dade2eec3125f283a9db63 (diff)
serial: imx: remove the redundant code
In the imx_startup(), we will reset the uart port which will reset all the FIFOs, including the URXD. So the code to clear the RX FIFO is redundant. Just remove it. Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/imx.c9
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 060ae9753923..d373fe83da52 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -1161,15 +1161,6 @@ static int imx_startup(struct uart_port *port)
1161 temp |= UCR2_IRTS; 1161 temp |= UCR2_IRTS;
1162 writel(temp, sport->port.membase + UCR2); 1162 writel(temp, sport->port.membase + UCR2);
1163 1163
1164 if (USE_IRDA(sport)) {
1165 /* clear RX-FIFO */
1166 int i = 64;
1167 while ((--i > 0) &&
1168 (readl(sport->port.membase + URXD0) & URXD_CHARRDY)) {
1169 barrier();
1170 }
1171 }
1172
1173 if (!is_imx1_uart(sport)) { 1164 if (!is_imx1_uart(sport)) {
1174 temp = readl(sport->port.membase + UCR3); 1165 temp = readl(sport->port.membase + UCR3);
1175 temp |= IMX21_UCR3_RXDMUXSEL | UCR3_ADNIMP; 1166 temp |= IMX21_UCR3_RXDMUXSEL | UCR3_ADNIMP;