[PATCH 4/6] remoteproc: da8xx: Use devm_rproc_alloc() helper

[Andrew Davis]

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 <a...@ti.com>
---
 drivers/remoteproc/da8xx_remoteproc.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/drivers/remoteproc/da8xx_remoteproc.c 
b/drivers/remoteproc/da8xx_remoteproc.c
index 9041a0e07fb25..c8b7576937733 100644
--- a/drivers/remoteproc/da8xx_remoteproc.c
+++ b/drivers/remoteproc/da8xx_remoteproc.c
@@ -295,8 +295,8 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
                }
        }
 
-       rproc = rproc_alloc(dev, "dsp", &da8xx_rproc_ops, da8xx_fw_name,
-               sizeof(*drproc));
+       rproc = devm_rproc_alloc(dev, "dsp", &da8xx_rproc_ops, da8xx_fw_name,
+                                sizeof(*drproc));
        if (!rproc) {
                ret = -ENOMEM;
                goto free_mem;
@@ -313,7 +313,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
 
        ret = da8xx_rproc_get_internal_memories(pdev, drproc);
        if (ret)
-               goto free_rproc;
+               goto free_mem;
 
        platform_set_drvdata(pdev, rproc);
 
@@ -323,7 +323,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
                                        rproc);
        if (ret) {
                dev_err(dev, "devm_request_threaded_irq error: %d\n", ret);
-               goto free_rproc;
+               goto free_mem;
        }
 
        /*
@@ -333,7 +333,7 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
         */
        ret = reset_control_assert(dsp_reset);
        if (ret)
-               goto free_rproc;
+               goto free_mem;
 
        drproc->chipsig = chipsig;
        drproc->bootreg = bootreg;
@@ -344,13 +344,11 @@ static int da8xx_rproc_probe(struct platform_device *pdev)
        ret = rproc_add(rproc);
        if (ret) {
                dev_err(dev, "rproc_add failed: %d\n", ret);
-               goto free_rproc;
+               goto free_mem;
        }
 
        return 0;
 
-free_rproc:
-       rproc_free(rproc);
 free_mem:
        if (dev->of_node)
                of_reserved_mem_device_release(dev);
@@ -371,7 +369,6 @@ static void da8xx_rproc_remove(struct platform_device *pdev)
        disable_irq(drproc->irq);
 
        rproc_del(rproc);
-       rproc_free(rproc);
        if (dev->of_node)
                of_reserved_mem_device_release(dev);
 }
-- 
2.39.2