Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SERIAL] Remove UPF_AUTOPROBE and UPF_BOOT_ONLYMCA

The functionality UPF_BOOT_ONLYMCA provided has been replaced by
the 8250_mca module, which only registers MCA ports if MCA is
present.

UPF_AUTOPROBE has no functional effect - in fact, it's never
tested. Only ibmasm set the flag.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Russell King and committed by
Russell King
ca740803 ce8337cb

+1 -10
+1 -1
drivers/misc/ibmasm/uart.c
··· 50 50 memset(&uport, 0, sizeof(struct uart_port)); 51 51 uport.irq = sp->irq; 52 52 uport.uartclk = 3686400; 53 - uport.flags = UPF_AUTOPROBE | UPF_SHARE_IRQ; 53 + uport.flags = UPF_SHARE_IRQ; 54 54 uport.iotype = UPIO_MEM; 55 55 uport.membase = iomem_base; 56 56
-7
drivers/serial/8250.c
··· 31 31 #include <linux/init.h> 32 32 #include <linux/console.h> 33 33 #include <linux/sysrq.h> 34 - #include <linux/mca.h> 35 34 #include <linux/delay.h> 36 35 #include <linux/platform_device.h> 37 36 #include <linux/tty.h> ··· 2024 2025 struct uart_8250_port *up = (struct uart_8250_port *)port; 2025 2026 int probeflags = PROBE_ANY; 2026 2027 int ret; 2027 - 2028 - /* 2029 - * Don't probe for MCA ports on non-MCA machines. 2030 - */ 2031 - if (up->port.flags & UPF_BOOT_ONLYMCA && !MCA_bus) 2032 - return; 2033 2028 2034 2029 /* 2035 2030 * Find the region that we can probe for. This in turn
-2
include/linux/serial_core.h
··· 245 245 #define UPF_HARDPPS_CD (1 << 11) 246 246 #define UPF_LOW_LATENCY (1 << 13) 247 247 #define UPF_BUGGY_UART (1 << 14) 248 - #define UPF_AUTOPROBE (1 << 15) 249 248 #define UPF_MAGIC_MULTIPLIER (1 << 16) 250 - #define UPF_BOOT_ONLYMCA (1 << 22) 251 249 #define UPF_CONS_FLOW (1 << 23) 252 250 #define UPF_SHARE_IRQ (1 << 24) 253 251 #define UPF_BOOT_AUTOCONF (1 << 28)