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

Commit 755dd8aa authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

serial: 8250_ingenic: drop #if conditional surrounding earlycon code 



The #if defined(CONFIG_SERIAL_EARLYCON) && !defined(MODULE)
conditional has been added to the OF_EARLYCON_DECLARE() define.

The same conditional can be dropped from 8250_ingenic.c because
the unused symbols will be marked as __maybe_unsed.
Also, the Kconfig dependency can become much simpler.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae73975f

drivers/tty/serial/8250/8250_ingenic.c

+0 −2
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ static const struct of_device_id of_match[]; 
#define UART_MCR_MDCE	BIT(7)

#define UART_MCR_FCM	BIT(6)



#if defined(CONFIG_SERIAL_EARLYCON) && !defined(MODULE)

static struct earlycon_device *early_device;



static uint8_t __init early_in(struct uart_port *port, int offset)
@@ -141,7 +140,6 @@ OF_EARLYCON_DECLARE(jz4775_uart, "ingenic,jz4775-uart", 
EARLYCON_DECLARE(jz4780_uart, ingenic_early_console_setup);

OF_EARLYCON_DECLARE(jz4780_uart, "ingenic,jz4780-uart",

		    ingenic_early_console_setup);

#endif /* CONFIG_SERIAL_EARLYCON */



static void ingenic_uart_serial_out(struct uart_port *p, int offset, int value)

{

drivers/tty/serial/8250/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ config SERIAL_8250_UNIPHIER 
config SERIAL_8250_INGENIC

	tristate "Support for Ingenic SoC serial ports"

	depends on SERIAL_8250

	depends on (OF_FLATTREE && SERIAL_8250_CONSOLE) || !SERIAL_EARLYCON

	depends on OF_FLATTREE

	depends on MIPS || COMPILE_TEST

	help

	  If you have a system using an Ingenic SoC and wish to make use of