Commit 7d5006d5 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

mxser: simplify condition in mxser_receive_chars_new 



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: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210922075938.31390-2-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3fdfa165

drivers/tty/mxser.c

+1 −5
Original line number Diff line number Diff line
@@ -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);