Commit 61598559 authored by Andrew Davis's avatar Andrew Davis Committed by Mathieu Poirier
Browse files

remoteproc: omap: Use devm_rproc_alloc() helper 



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: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240610151721.189472-1-afd@ti.com


Signed-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 2fa26ca8

drivers/remoteproc/omap_remoteproc.c

+8 −12
Original line number Diff line number Diff line
@@ -1305,7 +1305,7 @@ static int omap_rproc_probe(struct platform_device *pdev) 
		return ret;

	}



	rproc = rproc_alloc(&pdev->dev, dev_name(&pdev->dev), &omap_rproc_ops,

	rproc = devm_rproc_alloc(&pdev->dev, dev_name(&pdev->dev), &omap_rproc_ops,

				 firmware, sizeof(*oproc));

	if (!rproc)

		return -ENOMEM;
@@ -1318,15 +1318,15 @@ static int omap_rproc_probe(struct platform_device *pdev) 


	ret = omap_rproc_of_get_internal_memories(pdev, rproc);

	if (ret)

		goto free_rproc;

		return ret;



	ret = omap_rproc_get_boot_data(pdev, rproc);

	if (ret)

		goto free_rproc;

		return ret;



	ret = omap_rproc_of_get_timers(pdev, rproc);

	if (ret)

		goto free_rproc;

		return ret;



	init_completion(&oproc->pm_comp);

	oproc->autosuspend_delay = DEFAULT_AUTOSUSPEND_DELAY;
@@ -1337,10 +1337,8 @@ static int omap_rproc_probe(struct platform_device *pdev) 
	pm_runtime_set_autosuspend_delay(&pdev->dev, oproc->autosuspend_delay);



	oproc->fck = devm_clk_get(&pdev->dev, 0);

	if (IS_ERR(oproc->fck)) {

		ret = PTR_ERR(oproc->fck);

		goto free_rproc;

	}

	if (IS_ERR(oproc->fck))

		return PTR_ERR(oproc->fck);



	ret = of_reserved_mem_device_init(&pdev->dev);

	if (ret) {
@@ -1359,8 +1357,7 @@ static int omap_rproc_probe(struct platform_device *pdev) 


release_mem:

	of_reserved_mem_device_release(&pdev->dev);

free_rproc:

	rproc_free(rproc);



	return ret;

}
@@ -1369,7 +1366,6 @@ static void omap_rproc_remove(struct platform_device *pdev) 
	struct rproc *rproc = platform_get_drvdata(pdev);



	rproc_del(rproc);

	rproc_free(rproc);

	of_reserved_mem_device_release(&pdev->dev);

}