Skip to content

Commit

Permalink
serial: uartps: Remove static port array
Browse files Browse the repository at this point in the history
Allocate uart port structure dynamically.

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>
  • Loading branch information
Michal Simek authored and Greg Kroah-Hartman committed Apr 25, 2018
1 parent 1f21072 commit 0a84bae
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions drivers/tty/serial/xilinx_uartps.c
Original file line number Diff line number Diff line change
Expand Up @@ -1097,8 +1097,6 @@ static const struct uart_ops cdns_uart_ops = {
#endif
};

static struct uart_port cdns_uart_port[CDNS_UART_NR_PORTS];

#ifdef CONFIG_SERIAL_XILINX_PS_UART_CONSOLE
/**
* cdns_uart_console_wait_tx - Wait for the TX to be full
Expand Down Expand Up @@ -1436,6 +1434,9 @@ static int cdns_uart_probe(struct platform_device *pdev)
GFP_KERNEL);
if (!cdns_uart_data)
return -ENOMEM;
port = devm_kzalloc(&pdev->dev, sizeof(*port), GFP_KERNEL);
if (!port)
return -ENOMEM;

match = of_match_node(cdns_uart_of_match, pdev->dev.of_node);
if (match && match->data) {
Expand Down Expand Up @@ -1501,16 +1502,7 @@ static int cdns_uart_probe(struct platform_device *pdev)
if (id < 0)
id = 0;

/* Try the given port id if failed use default method */
if (id < CDNS_UART_NR_PORTS && cdns_uart_port[id].mapbase != 0) {
/* Find the next unused port */
for (id = 0; id < CDNS_UART_NR_PORTS; id++)
if (cdns_uart_port[id].mapbase == 0)
break;
}

port = &cdns_uart_port[id];
if (!port || id >= CDNS_UART_NR_PORTS) {
if (id >= CDNS_UART_NR_PORTS) {
dev_err(&pdev->dev, "Cannot get uart_port structure\n");
rc = -ENODEV;
goto err_out_notif_unreg;
Expand Down

0 comments on commit 0a84bae

Please sign in to comment.