diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2023-01-23 20:17:41 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-01-31 10:59:40 +0100 |
| commit | 297cb3f0b94bfedd781426814f1798a5c5658050 (patch) | |
| tree | f3dca1d94c0e125c3f2089486d23ffce91185262 | |
| parent | tty: serial: fsl_lpuart: add imx8ulp support (diff) | |
| download | linux-297cb3f0b94bfedd781426814f1798a5c5658050.tar.xz linux-297cb3f0b94bfedd781426814f1798a5c5658050.zip | |
serial: liteuart: Don't mix devm_*() with non-devm_*() calls
In the probe we need to call all devm_*() first followed by
non-devm_*() calls. This is due to reversed clean up that
may happen in a wrong order otherwise. The driver currently
allocates xarray before calling
devm_platform_get_and_ioremap_resource(). While it's not an
issue in this certain case, it's still better to be pedantic.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Gabriel Somlo <somlo@cmu.edu>
Link: https://lore.kernel.org/r/20230123191741.79751-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/tty/serial/liteuart.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c index 192ad681de35..562892395570 100644 --- a/drivers/tty/serial/liteuart.c +++ b/drivers/tty/serial/liteuart.c @@ -286,37 +286,35 @@ static int liteuart_probe(struct platform_device *pdev) struct xa_limit limit; int dev_id, ret; - /* look for aliases; auto-enumerate for free index if not found */ - dev_id = of_alias_get_id(pdev->dev.of_node, "serial"); - if (dev_id < 0) - limit = XA_LIMIT(0, CONFIG_SERIAL_LITEUART_MAX_PORTS); - else - limit = XA_LIMIT(dev_id, dev_id); - uart = devm_kzalloc(&pdev->dev, sizeof(struct liteuart_port), GFP_KERNEL); if (!uart) return -ENOMEM; - ret = xa_alloc(&liteuart_array, &dev_id, uart, limit, GFP_KERNEL); - if (ret) - return ret; - - uart->id = dev_id; port = &uart->port; /* get membase */ port->membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); - if (IS_ERR(port->membase)) { - ret = PTR_ERR(port->membase); - goto err_erase_id; - } + if (IS_ERR(port->membase)) + return PTR_ERR(port->membase); ret = platform_get_irq_optional(pdev, 0); if (ret < 0 && ret != -ENXIO) - goto err_erase_id; + return ret; if (ret > 0) port->irq = ret; + /* look for aliases; auto-enumerate for free index if not found */ + dev_id = of_alias_get_id(pdev->dev.of_node, "serial"); + if (dev_id < 0) + limit = XA_LIMIT(0, CONFIG_SERIAL_LITEUART_MAX_PORTS); + else + limit = XA_LIMIT(dev_id, dev_id); + + ret = xa_alloc(&liteuart_array, &dev_id, uart, limit, GFP_KERNEL); + if (ret) + return ret; + + uart->id = dev_id; /* values not from device tree */ port->dev = &pdev->dev; port->iotype = UPIO_MEM; |