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

Commit 507224aa authored by Valentin Rothberg's avatar Valentin Rothberg Committed by Greg Kroah-Hartman
Browse files

serial: 8250: remove Kconfig indirection 



Remove CONFIG_SERIAL_DETECT_IRQ and CONFIG_SERIAL_MANY_PORTS, and
substitute all references to the proper 8250 Kconfig options.  Now, the
actual Kconfig dependencies are not hidden when reading the code and
static analyzers are less confused.

Signed-off-by: default avatarValentin Rothberg <valentinrothberg@gmail.com>
Reviewed-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6b3cddcc

arch/alpha/include/asm/serial.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define BASE_BAUD ( 1843200 / 16 )



/* Standard COM flags (except for COM4, because of the 8514 problem) */

#ifdef CONFIG_SERIAL_DETECT_IRQ

#ifdef CONFIG_SERIAL_8250_DETECT_IRQ

#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)

#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)

#else

arch/m68k/include/asm/serial.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define BASE_BAUD ( 1843200 / 16 )



/* Standard COM flags (except for COM4, because of the 8514 problem) */

#ifdef CONFIG_SERIAL_DETECT_IRQ

#ifdef CONFIG_SERIAL_8250_DETECT_IRQ

#define STD_COM_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)

#define STD_COM4_FLAGS (ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)

#else

arch/mn10300/include/asm/serial.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define _ASM_SERIAL_H



/* Standard COM flags (except for COM4, because of the 8514 problem) */

#ifdef CONFIG_SERIAL_DETECT_IRQ

#ifdef CONFIG_SERIAL_8250_DETECT_IRQ

#define STD_COM_FLAGS	(ASYNC_BOOT_AUTOCONF | ASYNC_SKIP_TEST | ASYNC_AUTO_IRQ)

#define STD_COM4_FLAGS	(ASYNC_BOOT_AUTOCONF | ASYNC_AUTO_IRQ)

#else
@@ -21,7 +21,7 @@ 
#define STD_COM4_FLAGS	ASYNC_BOOT_AUTOCONF

#endif



#ifdef CONFIG_SERIAL_MANY_PORTS

#ifdef CONFIG_SERIAL_8250_MANY_PORTS

#define FOURPORT_FLAGS	ASYNC_FOURPORT

#define ACCENT_FLAGS	0

#define BOCA_FLAGS	0

arch/x86/include/asm/serial.h

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#define BASE_BAUD (1843200/16)



/* Standard COM flags (except for COM4, because of the 8514 problem) */

#ifdef CONFIG_SERIAL_DETECT_IRQ

#ifdef CONFIG_SERIAL_8250_DETECT_IRQ

# define STD_COMX_FLAGS	(UPF_BOOT_AUTOCONF |	UPF_SKIP_TEST	| UPF_AUTO_IRQ)

# define STD_COM4_FLAGS	(UPF_BOOT_AUTOCONF |	0		| UPF_AUTO_IRQ)

#else

drivers/tty/serial/8250/8250_core.c

+0 −8
Original line number Diff line number Diff line
@@ -85,14 +85,6 @@ static unsigned int skip_txen_test; /* force skip of txen test at init time */ 
#define BOTH_EMPTY 	(UART_LSR_TEMT | UART_LSR_THRE)





#ifdef CONFIG_SERIAL_8250_DETECT_IRQ

#define CONFIG_SERIAL_DETECT_IRQ 1

#endif

#ifdef CONFIG_SERIAL_8250_MANY_PORTS

#define CONFIG_SERIAL_MANY_PORTS 1

#endif





#include <asm/serial.h>

/*

 * SERIAL_PORT_DFNS tells us about built-in ports that have no