[PATCH 2/7] mxser: simplify condition in mxser_receive_chars_new
From: Jiri Slaby <hidden>
Date: 2021-09-22 07:59:46
Also in:
lkml
Subsystem:
moxa smartio/industio/intellio serial card, the rest, tty layer and serial drivers · Maintainers:
Jiri Slaby, Linus Torvalds, Greg Kroah-Hartman
mxser_receive_chars_old() is used whenever MOXA_MUST_LSR_RERR is set in status no matter the HW ID (the last 'if'). So there is no need for another check of MOXA_MUST_LSR_RERR _with_ hwid == MOXA_MUST_MU860_HWID (the third 'if'). Hence remove this subcase. That allows us to check status on a single line with both UART_LSR_BRK_ERROR_BITS (from the second 'if') and MOXA_MUST_LSR_RERR (the last 'if'). Signed-off-by: Jiri Slaby <redacted> --- drivers/tty/mxser.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index b9cc41782ce1..f907de56e08b 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c@@ -1550,11 +1550,7 @@ static bool mxser_receive_chars_new(struct tty_struct *tty, if (hwid == MOXA_OTHER_UART) return false; - if (status & UART_LSR_BRK_ERROR_BITS) - return false; - if (hwid == MOXA_MUST_MU860_HWID && (status & MOXA_MUST_LSR_RERR)) - return false; - if (status & MOXA_MUST_LSR_RERR) + if (status & (UART_LSR_BRK_ERROR_BITS | MOXA_MUST_LSR_RERR)) return false; gdl = inb(port->ioaddr + MOXA_MUST_GDL_REGISTER);
--
2.33.0