]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
remoteproc: imx_dsp_rproc: Simplify power domain attach and error handling
authorPeng Fan <peng.fan@nxp.com>
Wed, 19 Nov 2025 04:21:46 +0000 (12:21 +0800)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Wed, 19 Nov 2025 16:04:53 +0000 (09:04 -0700)
Refactor imx_dsp_attach_pm_domains() to use devm_pm_domain_attach_list()
directly, removing manual detach logic and simplifying resource management.

Also replace verbose error handling in imx_dsp_rproc_probe() with
dev_err_probe() for cleaner and more consistent error reporting.

No functional changes.

Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com>
Reviewed-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Tested-by: Iuliana Prodan <iuliana.prodan@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://lore.kernel.org/r/20251119-imx-dsp-2025-11-19-v4-1-adafd342d07b@nxp.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/remoteproc/imx_dsp_rproc.c

index 6e78a01755c7bdc28cd93f00fe6f74affc3d96b0..1f7d15227ce4fad46ab4c6d71774cf0560b9529e 100644 (file)
@@ -1062,14 +1062,12 @@ static const struct rproc_ops imx_dsp_rproc_ops = {
 static int imx_dsp_attach_pm_domains(struct imx_dsp_rproc *priv)
 {
        struct device *dev = priv->rproc->dev.parent;
-       int ret;
 
        /* A single PM domain is already attached. */
        if (dev->pm_domain)
                return 0;
 
-       ret = dev_pm_domain_attach_list(dev, NULL, &priv->pd_list);
-       return ret < 0 ? ret : 0;
+       return devm_pm_domain_attach_list(dev, NULL, &priv->pd_list);
 }
 
 /**
@@ -1186,45 +1184,33 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev)
 
        /* There are multiple power domains required by DSP on some platform */
        ret = imx_dsp_attach_pm_domains(priv);
-       if (ret) {
-               dev_err(dev, "failed on imx_dsp_attach_pm_domains\n");
-               return ret;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "failed on imx_dsp_attach_pm_domains\n");
+
        /* Get clocks */
        ret = imx_dsp_rproc_clk_get(priv);
-       if (ret) {
-               dev_err(dev, "failed on imx_dsp_rproc_clk_get\n");
-               goto err_detach_domains;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "failed on imx_dsp_rproc_clk_get\n");
 
        init_completion(&priv->pm_comp);
        rproc->auto_boot = false;
        ret = rproc_add(rproc);
-       if (ret) {
-               dev_err(dev, "rproc_add failed\n");
-               goto err_detach_domains;
-       }
+       if (ret)
+               return dev_err_probe(dev, ret, "rproc_add failed\n");
 
        rproc_coredump_set_elf_info(rproc, ELFCLASS32, EM_XTENSA);
 
        pm_runtime_enable(dev);
 
        return 0;
-
-err_detach_domains:
-       dev_pm_domain_detach_list(priv->pd_list);
-
-       return ret;
 }
 
 static void imx_dsp_rproc_remove(struct platform_device *pdev)
 {
        struct rproc *rproc = platform_get_drvdata(pdev);
-       struct imx_dsp_rproc *priv = rproc->priv;
 
        pm_runtime_disable(&pdev->dev);
        rproc_del(rproc);
-       dev_pm_domain_detach_list(priv->pd_list);
 }
 
 /* pm runtime functions */