From 5bc3ece38082faf89a30e03f510de17ef0425509 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 1 Dec 2022 10:32:23 +0000 Subject: [PATCH] Revert "serial: 8250: Let drivers request full 16550A feature probing" This reverts commit e6da7808c955e609b3adf9d18b02f94463616016 which is commit 9906890c89e4dbd900ed87ad3040080339a7f411 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 --- drivers/tty/serial/8250/8250_port.c | 3 +-- include/linux/serial_core.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 23eb1ce4cf00..e6cadb23850a 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -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; /* diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index b16373d10e43..9f60f549d956 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h @@ -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)