Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 07:23:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mxser: drop UART_MCR_AFE and UART_LSR_SPECIAL defines

Browse Source 
* UART_MCR_AFE is a redefinition of serial_reg.h's one.
* UART_LSR_SPECIAL is a redefinition of serial_reg.h's
  UART_LSR_BRK_ERROR_BITS.

So remove both and replace the latter uses by already defined
UART_LSR_BRK_ERROR_BITS.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210618061516.662-21-jslaby@suse.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Slaby 2021-06-18 08:14:26 +02:00 committed by Greg Kroah-Hartman
parent 02e431444b
commit 7064005232
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/tty/mxser.c
View File

@ -180,9 +180,6 @@
#define WAKEUP_CHARS 256
#define UART_MCR_AFE 0x20
#define UART_LSR_SPECIAL 0x1E
#define PCI_DEVICE_ID_POS104UL 0x1044
#define PCI_DEVICE_ID_CB108 0x1080
#define PCI_DEVICE_ID_CP102UF 0x1023
@ -2063,7 +2060,7 @@ static bool mxser_receive_chars_new(struct tty_struct *tty,
if (hwid == MOXA_OTHER_UART)
return false;
if (status & UART_LSR_SPECIAL)
if (status & UART_LSR_BRK_ERROR_BITS)
return false;
if (hwid == MOXA_MUST_MU860_HWID && (status & MOXA_MUST_LSR_RERR))
return false;
@ -2108,7 +2105,7 @@ static u8 mxser_receive_chars_old(struct tty_struct *tty,
break;
} else {
char flag = 0;
if (status & UART_LSR_SPECIAL) {
if (status & UART_LSR_BRK_ERROR_BITS) {
if (status & UART_LSR_BI) {
flag = TTY_BREAK;
port->icount.brk++;