Use device lifecycle managed devm_rproc_add() helper function. This
helps prevent mistakes like deleting out of order in cleanup functions
and forgetting to delete on all error paths.

Signed-off-by: Beleswar Padhi <b-pa...@ti.com>
---
v2: Changelog:
1. Re-ordered [PATCH 5/5] from v1 to [PATCH v2 4/5] in v2. [Andrew]
2. Removed redundant rproc_del() call in k3_r5_cluster_rproc_init() as
devm_rproc_add is used.

Link to v1:
https://lore.kernel.org/all/20241204111130.2218497-6-b-pa...@ti.com/

 drivers/remoteproc/ti_k3_r5_remoteproc.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/drivers/remoteproc/ti_k3_r5_remoteproc.c 
b/drivers/remoteproc/ti_k3_r5_remoteproc.c
index 3493bae95fdf..30b72bcb4d68 100644
--- a/drivers/remoteproc/ti_k3_r5_remoteproc.c
+++ b/drivers/remoteproc/ti_k3_r5_remoteproc.c
@@ -1266,7 +1266,7 @@ static int k3_r5_cluster_rproc_init(struct 
platform_device *pdev)
                        goto out;
                }
 
-               ret = rproc_add(rproc);
+               ret = devm_rproc_add(dev, rproc);
                if (ret) {
                        dev_err_probe(dev, ret, "rproc_add failed\n");
                        goto out;
@@ -1297,7 +1297,7 @@ static int k3_r5_cluster_rproc_init(struct 
platform_device *pdev)
                        dev_err(dev,
                                "Timed out waiting for %s core to power up!\n",
                                rproc->name);
-                       goto err_powerup;
+                       goto out;
                }
        }
 
@@ -1313,8 +1313,6 @@ static int k3_r5_cluster_rproc_init(struct 
platform_device *pdev)
                }
        }
 
-err_powerup:
-       rproc_del(rproc);
 out:
        /* undo core0 upon any failures on core1 in split-mode */
        if (cluster->mode == CLUSTER_MODE_SPLIT && core == core1) {
@@ -1357,8 +1355,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
                }
 
                mbox_free_channel(kproc->mbox);
-
-               rproc_del(rproc);
        }
 }
 
-- 
2.34.1


Reply via email to