diff mbox series

[2/9] remoteproc: imx_rproc: Use devm_rproc_alloc() helper

Message ID 20240123184632.725054-2-afd@ti.com
State New
Headers
Series [1/9] remoteproc: imx_dsp_rproc: Use devm_rproc_alloc() helper |

Commit Message

Andrew Davis Jan. 23, 2024, 6:46 p.m. UTC 
  Use the device lifecycle managed allocation function. This helps prevent
mistakes like freeing out of order in cleanup functions and forgetting to
free on error paths.

Signed-off-by: Andrew Davis <afd@ti.com>
---
 drivers/remoteproc/imx_rproc.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

Comments

Iuliana Prodan Jan. 24, 2024, 10:12 p.m. UTC | #1 
On 1/23/2024 8:46 PM, Andrew Davis wrote:
> Use the device lifecycle managed allocation function. This helps prevent
> mistakes like freeing out of order in cleanup functions and forgetting to
> free on error paths.
>
> Signed-off-by: Andrew Davis <afd@ti.com>

Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>

Thanks,
Iulia

> ---
>   drivers/remoteproc/imx_rproc.c | 16 +++++-----------
>   1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 8bb293b9f327c..55ecce3ab5f75 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -1104,16 +1104,14 @@ static int imx_rproc_probe(struct platform_device *pdev)
>   	int ret;
>   
>   	/* set some other name then imx */
> -	rproc = rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
> -			    NULL, sizeof(*priv));
> +	rproc = devm_rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
> +				 NULL, sizeof(*priv));
>   	if (!rproc)
>   		return -ENOMEM;
>   
>   	dcfg = of_device_get_match_data(dev);
> -	if (!dcfg) {
> -		ret = -EINVAL;
> -		goto err_put_rproc;
> -	}
> +	if (!dcfg)
> +		return -EINVAL;
>   
>   	priv = rproc->priv;
>   	priv->rproc = rproc;
> @@ -1124,8 +1122,7 @@ static int imx_rproc_probe(struct platform_device *pdev)
>   	priv->workqueue = create_workqueue(dev_name(dev));
>   	if (!priv->workqueue) {
>   		dev_err(dev, "cannot create workqueue\n");
> -		ret = -ENOMEM;
> -		goto err_put_rproc;
> +		return -ENOMEM;
>   	}
>   
>   	ret = imx_rproc_xtr_mbox_init(rproc);
> @@ -1167,8 +1164,6 @@ static int imx_rproc_probe(struct platform_device *pdev)
>   	imx_rproc_free_mbox(rproc);
>   err_put_wkq:
>   	destroy_workqueue(priv->workqueue);
> -err_put_rproc:
> -	rproc_free(rproc);
>   
>   	return ret;
>   }
> @@ -1183,7 +1178,6 @@ static void imx_rproc_remove(struct platform_device *pdev)
>   	imx_rproc_put_scu(rproc);
>   	imx_rproc_free_mbox(rproc);
>   	destroy_workqueue(priv->workqueue);
> -	rproc_free(rproc);
>   }
>   
>   static const struct of_device_id imx_rproc_of_match[] = {
diff mbox series

Patch

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index 8bb293b9f327c..55ecce3ab5f75 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -1104,16 +1104,14 @@  static int imx_rproc_probe(struct platform_device *pdev)
 	int ret;
 
 	/* set some other name then imx */
-	rproc = rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
-			    NULL, sizeof(*priv));
+	rproc = devm_rproc_alloc(dev, "imx-rproc", &imx_rproc_ops,
+				 NULL, sizeof(*priv));
 	if (!rproc)
 		return -ENOMEM;
 
 	dcfg = of_device_get_match_data(dev);
-	if (!dcfg) {
-		ret = -EINVAL;
-		goto err_put_rproc;
-	}
+	if (!dcfg)
+		return -EINVAL;
 
 	priv = rproc->priv;
 	priv->rproc = rproc;
@@ -1124,8 +1122,7 @@  static int imx_rproc_probe(struct platform_device *pdev)
 	priv->workqueue = create_workqueue(dev_name(dev));
 	if (!priv->workqueue) {
 		dev_err(dev, "cannot create workqueue\n");
-		ret = -ENOMEM;
-		goto err_put_rproc;
+		return -ENOMEM;
 	}
 
 	ret = imx_rproc_xtr_mbox_init(rproc);
@@ -1167,8 +1164,6 @@  static int imx_rproc_probe(struct platform_device *pdev)
 	imx_rproc_free_mbox(rproc);
 err_put_wkq:
 	destroy_workqueue(priv->workqueue);
-err_put_rproc:
-	rproc_free(rproc);
 
 	return ret;
 }
@@ -1183,7 +1178,6 @@  static void imx_rproc_remove(struct platform_device *pdev)
 	imx_rproc_put_scu(rproc);
 	imx_rproc_free_mbox(rproc);
 	destroy_workqueue(priv->workqueue);
-	rproc_free(rproc);
 }
 
 static const struct of_device_id imx_rproc_of_match[] = {