qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remoteproc: k3-r5: Use devm_rproc_alloc() helper 

JIRA: https://issues.redhat.com/browse/RHEL-60788

commit c81ef0cb576a3995edf24b63e9639881f19a2122
Author: Beleswar Padhi <b-padhi@ti.com>
Date:   Thu Aug 8 13:11:25 2024 +0530

    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: Beleswar Padhi <b-padhi@ti.com>
    Reviewed-by: Andrew Davis <afd@ti.com>
    Link: https://lore.kernel.org/r/20240808074127.2688131-2-b-padhi@ti.com
    Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>

Signed-off-by: Jared Kangas <jkangas@redhat.com>
This commit is contained in:
Jared Kangas 2024-09-30 09:01:28 -07:00
parent 9fdf553d78
commit ed84020b52
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/remoteproc/ti_k3_r5_remoteproc.c
View File

@ -1259,8 +1259,8 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
goto out;
}
rproc = rproc_alloc(cdev, dev_name(cdev), &k3_r5_rproc_ops,
fw_name, sizeof(*kproc));
rproc = devm_rproc_alloc(cdev, dev_name(cdev), &k3_r5_rproc_ops,
fw_name, sizeof(*kproc));
if (!rproc) {
ret = -ENOMEM;
goto out;
@ -1280,7 +1280,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
ret = k3_r5_rproc_configure_mode(kproc);
if (ret < 0)
goto err_config;
goto out;
if (ret)
goto init_rmem;
@ -1288,7 +1288,7 @@ static int k3_r5_cluster_rproc_init(struct platform_device *pdev)
if (ret) {
dev_err(dev, "initial configure failed, ret = %d\n",
ret);
goto err_config;
goto out;
}
init_rmem:
@ -1298,7 +1298,7 @@ init_rmem:
if (ret) {
dev_err(dev, "reserved memory init failed, ret = %d\n",
ret);
goto err_config;
goto out;
}
ret = rproc_add(rproc);
@ -1351,9 +1351,6 @@ err_split:
rproc_del(rproc);
err_add:
k3_r5_reserved_mem_exit(kproc);
err_config:
rproc_free(rproc);
core->rproc = NULL;
out:
/* undo core0 upon any failures on core1 in split-mode */
if (cluster->mode == CLUSTER_MODE_SPLIT && core == core1) {
@ -1398,9 +1395,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
rproc_del(rproc);
k3_r5_reserved_mem_exit(kproc);
rproc_free(rproc);
core->rproc = NULL;
}
}