From: Jiri Slaby Date: Fri, 18 Jun 2021 06:14:26 +0000 (+0200) Subject: mxser: drop UART_MCR_AFE and UART_LSR_SPECIAL defines X-Git-Tag: v5.14-rc1~65^2~62 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=70640052324b69de70711c2a3e43bb0a8cff5f7a;p=thirdparty%2Fkernel%2Flinux.git mxser: drop UART_MCR_AFE and UART_LSR_SPECIAL defines * 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 Link: https://lore.kernel.org/r/20210618061516.662-21-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 53136a7d92b16..79d7cecb77659 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -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++;