remoteproc: k3-r5: Use devm_rproc_add() helper
[ Upstream commit de182d2f5ca0801425919f38ec955033c09c601d ] 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-padhi@ti.com> Reviewed-by: Andrew Davis <afd@ti.com> Link: https://lore.kernel.org/r/20241219110545.1898883-5-b-padhi@ti.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> Stable-dep-of: 701177511abd ("remoteproc: k3-r5: Refactor sequential core power up/down operations") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
0ea3572c15
commit
b14a64c1a9
@@ -1258,7 +1258,7 @@ init_rmem:
|
|||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = rproc_add(rproc);
|
ret = devm_rproc_add(dev, rproc);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err_probe(dev, ret, "rproc_add failed\n");
|
dev_err_probe(dev, ret, "rproc_add failed\n");
|
||||||
goto out;
|
goto out;
|
||||||
@@ -1289,7 +1289,7 @@ init_rmem:
|
|||||||
dev_err(dev,
|
dev_err(dev,
|
||||||
"Timed out waiting for %s core to power up!\n",
|
"Timed out waiting for %s core to power up!\n",
|
||||||
rproc->name);
|
rproc->name);
|
||||||
goto err_powerup;
|
goto out;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1305,8 +1305,6 @@ err_split:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
err_powerup:
|
|
||||||
rproc_del(rproc);
|
|
||||||
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) {
|
||||||
@@ -1349,8 +1347,6 @@ static void k3_r5_cluster_rproc_exit(void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
mbox_free_channel(kproc->mbox);
|
mbox_free_channel(kproc->mbox);
|
||||||
|
|
||||||
rproc_del(rproc);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user