Skip to content

Commit 6159855

Browse files
glneomathieupoirier
authored andcommitted
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: Andrew Davis <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mathieu Poirier <[email protected]>
1 parent 2fa26ca commit 6159855

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

drivers/remoteproc/omap_remoteproc.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1305,8 +1305,8 @@ static int omap_rproc_probe(struct platform_device *pdev)
13051305
return ret;
13061306
}
13071307

1308-
rproc = rproc_alloc(&pdev->dev, dev_name(&pdev->dev), &omap_rproc_ops,
1309-
firmware, sizeof(*oproc));
1308+
rproc = devm_rproc_alloc(&pdev->dev, dev_name(&pdev->dev), &omap_rproc_ops,
1309+
firmware, sizeof(*oproc));
13101310
if (!rproc)
13111311
return -ENOMEM;
13121312

@@ -1318,15 +1318,15 @@ static int omap_rproc_probe(struct platform_device *pdev)
13181318

13191319
ret = omap_rproc_of_get_internal_memories(pdev, rproc);
13201320
if (ret)
1321-
goto free_rproc;
1321+
return ret;
13221322

13231323
ret = omap_rproc_get_boot_data(pdev, rproc);
13241324
if (ret)
1325-
goto free_rproc;
1325+
return ret;
13261326

13271327
ret = omap_rproc_of_get_timers(pdev, rproc);
13281328
if (ret)
1329-
goto free_rproc;
1329+
return ret;
13301330

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

13391339
oproc->fck = devm_clk_get(&pdev->dev, 0);
1340-
if (IS_ERR(oproc->fck)) {
1341-
ret = PTR_ERR(oproc->fck);
1342-
goto free_rproc;
1343-
}
1340+
if (IS_ERR(oproc->fck))
1341+
return PTR_ERR(oproc->fck);
13441342

13451343
ret = of_reserved_mem_device_init(&pdev->dev);
13461344
if (ret) {
@@ -1359,8 +1357,7 @@ static int omap_rproc_probe(struct platform_device *pdev)
13591357

13601358
release_mem:
13611359
of_reserved_mem_device_release(&pdev->dev);
1362-
free_rproc:
1363-
rproc_free(rproc);
1360+
13641361
return ret;
13651362
}
13661363

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

13711368
rproc_del(rproc);
1372-
rproc_free(rproc);
13731369
of_reserved_mem_device_release(&pdev->dev);
13741370
}
13751371

0 commit comments

Comments
 (0)