Commit 35373abb authored Jan 10, 2016 by Peter Hurley Committed by Greg Kroah-Hartman Jan 28, 2016

serial: Fix ASYNC_* => UPF_* flags misuse



The UPF_* flags are the correct values to use for struct uart_port
and struct old_serial_port/SERIAL_PORT_DFNS.

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 39b3d892

arch/alpha/include/asm/serial.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -14,11 +14,11 @@

	/* Standard COM flags (except for COM4, because of the 8514 problem) */		/* Standard COM flags (except for COM4, because of the 8514 problem) */
	#ifdef CONFIG_SERIAL_8250_DETECT_IRQ		#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST \| UPF_AUTO_IRQ)
	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)		#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF \| UPF_AUTO_IRQ)
	#else		#else
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST)
	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF		#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF
	#endif		#endif

	#define SERIAL_PORT_DFNS \		#define SERIAL_PORT_DFNS \

arch/frv/include/asm/serial.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -13,6 +13,6 @@
	*/		*/
	#define BASE_BAUD 0		#define BASE_BAUD 0

	#define STD_COM_FLAGS ASYNC_BOOT_AUTOCONF		#define STD_COM_FLAGS UPF_BOOT_AUTOCONF

	#define SERIAL_PORT_DFNS		#define SERIAL_PORT_DFNS

arch/m68k/include/asm/serial.h

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -18,11 +18,11 @@

	/* Standard COM flags (except for COM4, because of the 8514 problem) */		/* Standard COM flags (except for COM4, because of the 8514 problem) */
	#ifdef CONFIG_SERIAL_8250_DETECT_IRQ		#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST \| UPF_AUTO_IRQ)
	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)		#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF \| UPF_AUTO_IRQ)
	#else		#else
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST)
	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF		#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF
	#endif		#endif

	#ifdef CONFIG_ISA		#ifdef CONFIG_ISA

arch/mips/pmcs-msp71xx/msp_serial.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -110,7 +110,7 @@ void __init msp_serial_setup(void)
	up.uartclk = uartclk;		up.uartclk = uartclk;
	up.regshift = 2;		up.regshift = 2;
	up.iotype = UPIO_MEM;		up.iotype = UPIO_MEM;
	up.flags = ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST;		up.flags = UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST;
	up.type = PORT_16550A;		up.type = PORT_16550A;
	up.line = 0;		up.line = 0;
	up.serial_out = msp_serial_out;		up.serial_out = msp_serial_out;

arch/mn10300/include/asm/serial.h

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -14,15 +14,15 @@

	/* Standard COM flags (except for COM4, because of the 8514 problem) */		/* Standard COM flags (except for COM4, because of the 8514 problem) */
	#ifdef CONFIG_SERIAL_8250_DETECT_IRQ		#ifdef CONFIG_SERIAL_8250_DETECT_IRQ
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST \| ASYNC_AUTO_IRQ)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST \| UPF_AUTO_IRQ)
	#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_AUTO_IRQ)		#define STD_COM4_FLAGS (UPF_BOOT_AUTOCONF \| UPF_AUTO_IRQ)
	#else		#else
	#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF \| ASYNC_SKIP_TEST)		#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF \| UPF_SKIP_TEST)
	#define STD_COM4_FLAGS ASYNC_BOOT_AUTOCONF		#define STD_COM4_FLAGS UPF_BOOT_AUTOCONF
	#endif		#endif

	#ifdef CONFIG_SERIAL_8250_MANY_PORTS		#ifdef CONFIG_SERIAL_8250_MANY_PORTS
	#define FOURPORT_FLAGS ASYNC_FOURPORT		#define FOURPORT_FLAGS UPF_FOURPORT
	#define ACCENT_FLAGS 0		#define ACCENT_FLAGS 0
	#define BOCA_FLAGS 0		#define BOCA_FLAGS 0
	#define HUB6_FLAGS 0		#define HUB6_FLAGS 0