Commit 0f38c5e3 authored Apr 23, 2018 by Michal Simek Committed by Greg Kroah-Hartman Apr 25, 2018

serial: uartps: Remove console_initcall from the driver



register_console() is called from
uart_add_one_port()->uart_configure_port()
that's why register_console() is called twice.

This patch remove console_initcall to call register_console() only from
one location.

Also based on my tests cdns_uart_console_setup() is not called
from the first register_console() call.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent e76785d0

drivers/tty/serial/xilinx_uartps.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1293,20 +1293,6 @@ static struct console cdns_uart_console = {
		.index = -1, /* Specified on the cmdline (e.g. console=ttyPS ) */
		.data = &cdns_uart_uart_driver,
		};

		/**
		* cdns_uart_console_init - Initialization call
		*
		* Return: 0 on success, negative errno otherwise
		*/
		static int __init cdns_uart_console_init(void)
		{
		register_console(&cdns_uart_console);
		return 0;
		}

		console_initcall(cdns_uart_console_init);

		#endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */

		static struct uart_driver cdns_uart_uart_driver = {