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

Commit 10a5315b authored by Michal Simek's avatar Michal Simek Committed by Greg Kroah-Hartman
Browse files

serial: uartps: Fill struct uart_driver in probe() 



This is preparation step for dynamic port allocation without
CDNS_UART_NR_PORTS macro. Fill the structure only once at probe.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4bbb519

drivers/tty/serial/xilinx_uartps.c

+12 −14
Original line number Diff line number Diff line
@@ -1100,6 +1100,8 @@ static const struct uart_ops cdns_uart_ops = { 
#endif

};



static struct uart_driver cdns_uart_uart_driver;



#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE

/**

 * cdns_uart_console_putchar - write the character to the FIFO buffer
@@ -1240,8 +1242,6 @@ static int cdns_uart_console_setup(struct console *co, char *options) 
	return uart_set_options(port, co, baud, parity, bits, flow);

}



static struct uart_driver cdns_uart_uart_driver;



static struct console cdns_uart_console = {

	.name	= CDNS_UART_TTY_NAME,

	.write	= cdns_uart_console_write,
@@ -1253,18 +1253,6 @@ static struct console cdns_uart_console = { 
};

#endif /* CONFIG_SERIAL_XILINX_PS_UART_CONSOLE */



static struct uart_driver cdns_uart_uart_driver = {

	.owner		= THIS_MODULE,

	.driver_name	= CDNS_UART_NAME,

	.dev_name	= CDNS_UART_TTY_NAME,

	.major		= CDNS_UART_MAJOR,

	.minor		= CDNS_UART_MINOR,

	.nr		= CDNS_UART_NR_PORTS,

#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE

	.cons		= &cdns_uart_console,

#endif

};



#ifdef CONFIG_PM_SLEEP

/**

 * cdns_uart_suspend - suspend event
@@ -1430,6 +1418,16 @@ static int cdns_uart_probe(struct platform_device *pdev) 
	}



	if (!cdns_uart_uart_driver.state) {

		cdns_uart_uart_driver.owner = THIS_MODULE;

		cdns_uart_uart_driver.driver_name = CDNS_UART_NAME;

		cdns_uart_uart_driver.dev_name = CDNS_UART_TTY_NAME;

		cdns_uart_uart_driver.major = CDNS_UART_MAJOR;

		cdns_uart_uart_driver.minor = CDNS_UART_MINOR;

		cdns_uart_uart_driver.nr = CDNS_UART_NR_PORTS;

#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE

		cdns_uart_uart_driver.cons = &cdns_uart_console;

#endif



		rc = uart_register_driver(&cdns_uart_uart_driver);

		if (rc < 0) {

			dev_err(&pdev->dev, "Failed to register driver\n");