mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "serial: 8250: Let drivers request full 16550A feature probing"

Browse Source 
This reverts commit e6da7808c9 which is
commit 9906890c89 upstream.  This changes
the kernel API and is not needed at all in the 5.10.y branch and will be
reverted upstream as well.

Change-Id: I7d629d3765be366b77aafabf0e89fac7a5aa73b9
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman
2022-12-01 10:32:23 +00:00
parent f466ca1247
commit 5bc3ece380
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/tty/serial/8250/8250_port.c
View File

@@ -1023,8 +1023,7 @@ static void autoconfig_16550a(struct uart_8250_port *up)
up->port.type = PORT_16550A;
up->capabilities |= UART_CAP_FIFO;
if (!IS_ENABLED(CONFIG_SERIAL_8250_16550A_VARIANTS) &&
!(up->port.flags & UPF_FULL_PROBE))
if (!IS_ENABLED(CONFIG_SERIAL_8250_16550A_VARIANTS))
return;
/*

3
include/linux/serial_core.h
View File

@@ -104,7 +104,7 @@ struct uart_icount {
__u32 buf_overrun;
};
typedef u64 __bitwise upf_t;
typedef unsigned int __bitwise upf_t;
typedef unsigned int __bitwise upstat_t;
struct uart_port {
@@ -211,7 +211,6 @@ struct uart_port {
#define UPF_FIXED_PORT ((__force upf_t) (1 << 29))
#define UPF_DEAD ((__force upf_t) (1 << 30))
#define UPF_IOREMAP ((__force upf_t) (1 << 31))
#define UPF_FULL_PROBE ((__force upf_t) (1ULL << 32))
#define __UPF_CHANGE_MASK 0x17fff
#define UPF_CHANGE_MASK ((__force upf_t) __UPF_CHANGE_MASK)