AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

serial: Fix ASYNC_* => UPF_* flags misuse

Browse Source 
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>
This commit is contained in:
Peter Hurley 2016-01-10 20:23:58 -08:00 committed by Greg Kroah-Hartman
parent 39b3d8929f
commit 35373abbce
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/alpha/include/asm/serial.h
View File

@ -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 \

2
arch/frv/include/asm/serial.h
View File

@ -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

8
arch/m68k/include/asm/serial.h
View File

@ -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

2
arch/mips/pmcs-msp71xx/msp_serial.c
View File

@ -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;

10
arch/mn10300/include/asm/serial.h
View File

@ -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

2
arch/xtensa/platforms/xt2000/setup.c
View File

@ -113,7 +113,7 @@ void platform_heartbeat(void)
} }
//#define RS_TABLE_SIZE 2 //#define RS_TABLE_SIZE 2
//#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF|ASYNC_SKIP_TEST) //#define STD_COM_FLAGS (UPF_BOOT_AUTOCONF|UPF_SKIP_TEST)
#define _SERIAL_PORT(_base,_irq) \ #define _SERIAL_PORT(_base,_irq) \
{ \ { \

2
drivers/tty/serial/serial_ks8695.c
View File

@ -554,7 +554,7 @@ static struct uart_port ks8695uart_ports[SERIAL_KS8695_NR] = {
.uartclk = KS8695_CLOCK_RATE * 16, .uartclk = KS8695_CLOCK_RATE * 16,
.fifosize = 16, .fifosize = 16,
.ops = &ks8695uart_pops, .ops = &ks8695uart_pops,
.flags = ASYNC_BOOT_AUTOCONF, .flags = UPF_BOOT_AUTOCONF,
.line = 0, .line = 0,
} }
}; };