This is preparation step for dynamic port allocation without CDNS_UART_NR_PORTS macro. Fill the structure only once at probe.
Signed-off-by: Michal Simek <[email protected]> --- Changes in v2: - new patch - it can be sent separately too drivers/tty/serial/xilinx_uartps.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index b47d7ccbc38d..d76efe8cb3df 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c @@ -1260,18 +1260,6 @@ static int __init cdns_uart_console_setup(struct console *co, char *options) }; #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 @@ -1451,6 +1439,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"); -- 1.9.1
