Commit c81ef0cb authored by Beleswar Padhi's avatar Beleswar Padhi Committed by Mathieu Poirier

remoteproc: k3-r5: 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: default avatarBeleswar Padhi <b-padhi@ti.com>
Reviewed-by: default avatarAndrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20240808074127.2688131-2-b-padhi@ti.comSigned-off-by: default avatarMathieu Poirier <mathieu.poirier@linaro.org>
parent 9091225b
...@@ -1259,8 +1259,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) ...@@ -1259,8 +1259,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
goto out; goto out;
} }
rproc = rproc_alloc(cdev, dev_name(cdev), &k3_r5_rproc_ops, rproc = devm_rproc_alloc(cdev, dev_name(cdev), &k3_r5_rproc_ops,
fw_name, sizeof(*kproc)); fw_name, sizeof(*kproc));
if (!rproc) { if (!rproc) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
...@@ -1280,7 +1280,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) ...@@ -1280,7 +1280,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
ret = k3_r5_rproc_configure_mode(kproc); ret = k3_r5_rproc_configure_mode(kproc);
if (ret < 0) if (ret < 0)
goto err_config; goto out;
if (ret) if (ret)
goto init_rmem; goto init_rmem;
...@@ -1288,7 +1288,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) ...@@ -1288,7 +1288,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(dev, "initial configure failed, ret = %d\n", dev_err(dev, "initial configure failed, ret = %d\n",
ret); ret);
goto err_config; goto out;
} }
init_rmem: init_rmem:
...@@ -1298,7 +1298,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) ...@@ -1298,7 +1298,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(dev, "reserved memory init failed, ret = %d\n", dev_err(dev, "reserved memory init failed, ret = %d\n",
ret); ret);
goto err_config; goto out;
} }
ret = rproc_add(rproc); ret = rproc_add(rproc);
...@@ -1351,9 +1351,6 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev) ...@@ -1351,9 +1351,6 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
rproc_del(rproc); rproc_del(rproc);
err_add: err_add:
k3_r5_reserved_mem_exit(kproc); k3_r5_reserved_mem_exit(kproc);
err_config:
rproc_free(rproc);
core->rproc = NULL;
out: out:
/* undo core0 upon any failures on core1 in split-mode */ /* undo core0 upon any failures on core1 in split-mode */
if (cluster->mode == CLUSTER_MODE_SPLIT && core == core1) { if (cluster->mode == CLUSTER_MODE_SPLIT && core == core1) {
...@@ -1398,9 +1395,6 @@ static void k3_r5_cluster_rproc_exit(void *data) ...@@ -1398,9 +1395,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
rproc_del(rproc); rproc_del(rproc);
k3_r5_reserved_mem_exit(kproc); k3_r5_reserved_mem_exit(kproc);
rproc_free(rproc);
core->rproc = NULL;
} }
} }
......
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