[PATCH v1 1/1] serial: liteuart: Don't mix devm_*() with non-devm_*() calls

[PATCH v1 1/1] serial: liteuart: Don't mix devm_*() with non-devm_*() calls

[Andy Shevchenko]

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>
---
 drivers/tty/serial/liteuart.c | 32 +++++++++++++++-----------------
 1 file 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;
-- 
2.39.0

Re: [PATCH v1 1/1] serial: liteuart: Don't mix devm_*() with non-devm_*() calls

[Gabriel L. Somlo]

On Mon, Jan 23, 2023 at 09:17:41PM +0200, Andy Shevchenko wrote:
> 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>
> ---
>  drivers/tty/serial/liteuart.c | 32 +++++++++++++++-----------------
>  1 file 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;

Reviewed-by: Gabriel Somlo <somlo@cmu.edu>

Thanks,
--Gabriel

> -- 
> 2.39.0
>