Commit 5efcc364 authored by Andrew Davis's avatar Andrew Davis Committed by Mathieu Poirier

remoteproc: omap: Use devm action to release reserved memory

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-2-afd@ti.comSigned-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 61598559
...@@ -1277,6 +1277,13 @@ static int omap_rproc_of_get_timers(struct platform_device *pdev, ...@@ -1277,6 +1277,13 @@ static int omap_rproc_of_get_timers(struct platform_device *pdev,
return 0; return 0;
} }
static void omap_rproc_mem_release(void *data)
{
struct device *dev = data;
of_reserved_mem_device_release(dev);
}
static int omap_rproc_probe(struct platform_device *pdev) static int omap_rproc_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
...@@ -1346,19 +1353,17 @@ static int omap_rproc_probe(struct platform_device *pdev) ...@@ -1346,19 +1353,17 @@ static int omap_rproc_probe(struct platform_device *pdev)
dev_warn(&pdev->dev, "Typically this should be provided,\n"); dev_warn(&pdev->dev, "Typically this should be provided,\n");
dev_warn(&pdev->dev, "only omit if you know what you are doing.\n"); dev_warn(&pdev->dev, "only omit if you know what you are doing.\n");
} }
ret = devm_add_action_or_reset(&pdev->dev, omap_rproc_mem_release, &pdev->dev);
if (ret)
return ret;
platform_set_drvdata(pdev, rproc); platform_set_drvdata(pdev, rproc);
ret = rproc_add(rproc); ret = rproc_add(rproc);
if (ret) if (ret)
goto release_mem; return ret;
return 0; return 0;
release_mem:
of_reserved_mem_device_release(&pdev->dev);
return ret;
} }
static void omap_rproc_remove(struct platform_device *pdev) static void omap_rproc_remove(struct platform_device *pdev)
...@@ -1366,7 +1371,6 @@ static void omap_rproc_remove(struct platform_device *pdev) ...@@ -1366,7 +1371,6 @@ static void omap_rproc_remove(struct platform_device *pdev)
struct rproc *rproc = platform_get_drvdata(pdev); struct rproc *rproc = platform_get_drvdata(pdev);
rproc_del(rproc); rproc_del(rproc);
of_reserved_mem_device_release(&pdev->dev);
} }
static const struct dev_pm_ops omap_rproc_pm_ops = { static const struct dev_pm_ops omap_rproc_pm_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment