| From a3a0c254f3c9dd783561c6299917fc5dcbcb18e0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Wed, 12 May 2021 16:12:52 +0200 |
| Subject: serial: fsl_lpuart: remove RTSCTS handling from get_mctrl() |
| |
| From: Michael Walle <michael@walle.cc> |
| |
| [ Upstream commit e60c2991f18bf221fa9908ff10cb24eaedaa9bae ] |
| |
| The wrong code in set_mctrl() was already removed in commit 2b30efe2e88a |
| ("tty: serial: lpuart: Remove unnecessary code from set_mctrl"), but the |
| code in get_mctrl() wasn't removed. It will not return the state of the |
| RTS or CTS line but whether automatic flow control is enabled, which is |
| wrong for the get_mctrl(). Thus remove it. |
| |
| Fixes: 2b30efe2e88a ("tty: serial: lpuart: Remove unnecessary code from set_mctrl") |
| Signed-off-by: Michael Walle <michael@walle.cc> |
| Link: https://lore.kernel.org/r/20210512141255.18277-7-michael@walle.cc |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tty/serial/fsl_lpuart.c | 12 +----------- |
| 1 file changed, 1 insertion(+), 11 deletions(-) |
| |
| diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c |
| index 6b8e638c2389..de5ee4aad9f3 100644 |
| --- a/drivers/tty/serial/fsl_lpuart.c |
| +++ b/drivers/tty/serial/fsl_lpuart.c |
| @@ -1408,17 +1408,7 @@ static unsigned int lpuart_get_mctrl(struct uart_port *port) |
| |
| static unsigned int lpuart32_get_mctrl(struct uart_port *port) |
| { |
| - unsigned int temp = 0; |
| - unsigned long reg; |
| - |
| - reg = lpuart32_read(port, UARTMODIR); |
| - if (reg & UARTMODIR_TXCTSE) |
| - temp |= TIOCM_CTS; |
| - |
| - if (reg & UARTMODIR_RXRTSE) |
| - temp |= TIOCM_RTS; |
| - |
| - return temp; |
| + return 0; |
| } |
| |
| static void lpuart_set_mctrl(struct uart_port *port, unsigned int mctrl) |
| -- |
| 2.30.2 |
| |
