Replace the hand-rolled omap_rproc_mem_release() devres action with devm_of_reserved_mem_device_init(), which handles the cleanup automatically. This removes both the wrapper function and the devm_add_action_or_reset() call.
Signed-off-by: Mukesh Ojha <[email protected]> --- drivers/remoteproc/omap_remoteproc.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/remoteproc/omap_remoteproc.c b/drivers/remoteproc/omap_remoteproc.c index 6ed0f28edac9..74262f873d40 100644 --- a/drivers/remoteproc/omap_remoteproc.c +++ b/drivers/remoteproc/omap_remoteproc.c @@ -1276,13 +1276,6 @@ static int omap_rproc_of_get_timers(struct platform_device *pdev, 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) { struct device_node *np = pdev->dev.of_node; @@ -1359,15 +1352,11 @@ static int omap_rproc_probe(struct platform_device *pdev) if (IS_ERR(oproc->fck)) return PTR_ERR(oproc->fck); - ret = of_reserved_mem_device_init(&pdev->dev); - if (ret) { + if (devm_of_reserved_mem_device_init(&pdev->dev)) { dev_warn(&pdev->dev, "device does not have specific CMA pool.\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"); } - ret = devm_add_action_or_reset(&pdev->dev, omap_rproc_mem_release, &pdev->dev); - if (ret) - return ret; platform_set_drvdata(pdev, rproc); -- 2.53.0
