Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca740803 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ce8337cb

drivers/misc/ibmasm/uart.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void ibmasm_register_uart(struct service_processor *sp) 
	memset(&uport, 0, sizeof(struct uart_port));

	uport.irq	= sp->irq;

	uport.uartclk	= 3686400;

	uport.flags	= UPF_AUTOPROBE | UPF_SHARE_IRQ;

	uport.flags	= UPF_SHARE_IRQ;

	uport.iotype	= UPIO_MEM;

	uport.membase	= iomem_base;

drivers/serial/8250.c

+0 −7
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/init.h>

#include <linux/console.h>

#include <linux/sysrq.h>

#include <linux/mca.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/tty.h>
@@ -2026,12 +2025,6 @@ static void serial8250_config_port(struct uart_port *port, int flags) 
	int probeflags = PROBE_ANY;

	int ret;



	/*

	 * Don't probe for MCA ports on non-MCA machines.

	 */

	if (up->port.flags & UPF_BOOT_ONLYMCA && !MCA_bus)

		return;



	/*

	 * Find the region that we can probe for.  This in turn

	 * tells us whether we can probe for the type of port.

include/linux/serial_core.h

+0 −2
Original line number Diff line number Diff line
@@ -245,9 +245,7 @@ struct uart_port { 
#define UPF_HARDPPS_CD		(1 << 11)

#define UPF_LOW_LATENCY		(1 << 13)

#define UPF_BUGGY_UART		(1 << 14)

#define UPF_AUTOPROBE		(1 << 15)

#define UPF_MAGIC_MULTIPLIER	(1 << 16)

#define UPF_BOOT_ONLYMCA	(1 << 22)

#define UPF_CONS_FLOW		(1 << 23)

#define UPF_SHARE_IRQ		(1 << 24)

#define UPF_BOOT_AUTOCONF	(1 << 28)