1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 059ba354d17e..d9a73c7683ea 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -402,17 +402,6 @@ static void imx_uart_rts_inactive(struct imx_port *sport, u32 *ucr2)
         mctrl_gpio_set(sport->gpios, sport->port.mctrl);
 }
 
-/* called with port.lock taken and irqs caller dependent */
-static void imx_uart_rts_auto(struct imx_port *sport, u32 *ucr2)
-{
-        /*
-         * Only let receiver control RTS output if we were not requested to have
-         * RTS inactive (which then should take precedence).
-         */
-        if (*ucr2 & UCR2_CTS)
-                *ucr2 |= UCR2_CTSC;
-}
-
 /* called with port.lock taken and irqs off */
 static void imx_uart_start_rx(struct uart_port *port)
 {
@@ -1604,8 +1593,14 @@ imx_uart_set_termios(struct uart_port *port, struct ktermios *termios,
                 else
                         imx_uart_rts_inactive(sport, &ucr2);
 
-        } else if (termios->c_cflag & CRTSCTS)
-                imx_uart_rts_auto(sport, &ucr2);
+        } else if (termios->c_cflag & CRTSCTS) {
+                /*
+                 * Only let receiver control RTS output if we were not requested
+                 * to have RTS inactive (which then should take precedence).
+                 */
+                if (ucr2 & UCR2_CTS)
+                        ucr2 |= UCR2_CTSC;
+        }
 
         if (termios->c_cflag & CRTSCTS)
                 ucr2 &= ~UCR2_IRTS;