On Wed, Sep 17, 2025 at 09:19:15PM +0800, Peng Fan wrote:
> Convert imx_rproc_free_mbox() to a devm-managed cleanup action using
> devm_add_action_or_reset(). Ensure the mailbox resources are freed
> automatically with the device lifecycle, simplify error handling and
> removing the need for manual cleanup in probe and remove paths.
>
> Also improve error reporting by using dev_err_probe() for consistency and
> clarity.
>
> No functional changes.
>
> Signed-off-by: Peng Fan <peng....@nxp.com>
> ---
Reviewed-by: Frank Li <frank...@nxp.com>
> drivers/remoteproc/imx_rproc.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index
> cc776f5d75f1f614943c05250877f17537837068..e30b61ee39dacc88f9e938f8c6ffe61fef63dbda
> 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -93,7 +93,7 @@ struct imx_rproc_mem {
> #define ATT_CORE(I) BIT((I))
>
> static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block);
> -static void imx_rproc_free_mbox(struct rproc *rproc);
> +static void imx_rproc_free_mbox(void *data);
>
> struct imx_rproc {
> struct device *dev;
> @@ -780,8 +780,9 @@ static int imx_rproc_xtr_mbox_init(struct rproc *rproc,
> bool tx_block)
> return 0;
> }
>
> -static void imx_rproc_free_mbox(struct rproc *rproc)
> +static void imx_rproc_free_mbox(void *data)
> {
> + struct rproc *rproc = data;
> struct imx_rproc *priv = rproc->priv;
>
> if (priv->tx_ch) {
> @@ -1101,15 +1102,18 @@ static int imx_rproc_probe(struct platform_device
> *pdev)
> if (ret)
> return ret;
>
> + ret = devm_add_action_or_reset(dev, imx_rproc_free_mbox, rproc);
> + if (ret)
> + return dev_err_probe(dev, ret,
> + "Failed to add devm free mbox action:
> %d\n", ret);
> +
> ret = imx_rproc_addr_init(priv, pdev);
> - if (ret) {
> - dev_err(dev, "failed on imx_rproc_addr_init\n");
> - goto err_put_mbox;
> - }
> + if (ret)
> + return dev_err_probe(dev, ret, "failed on
> imx_rproc_addr_init\n");
>
> ret = imx_rproc_detect_mode(priv);
> if (ret)
> - goto err_put_mbox;
> + return dev_err_probe(dev, ret, "failed on detect mode\n");
>
> ret = imx_rproc_clk_enable(priv);
> if (ret)
> @@ -1174,8 +1178,6 @@ static int imx_rproc_probe(struct platform_device *pdev)
> clk_disable_unprepare(priv->clk);
> err_put_scu:
> imx_rproc_put_scu(rproc);
> -err_put_mbox:
> - imx_rproc_free_mbox(rproc);
>
> return ret;
> }
> @@ -1188,7 +1190,6 @@ static void imx_rproc_remove(struct platform_device
> *pdev)
> clk_disable_unprepare(priv->clk);
> rproc_del(rproc);
> imx_rproc_put_scu(rproc);
> - imx_rproc_free_mbox(rproc);
> }
>
> static const struct imx_rproc_plat_ops imx_rproc_ops_arm_smc = {
>
> --
> 2.37.1
>
