]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
remoteproc: keystone: Use devm_pm_runtime_enable() helper
authorAndrew Davis <afd@ti.com>
Thu, 14 Aug 2025 14:08:32 +0000 (09:08 -0500)
committerMathieu Poirier <mathieu.poirier@linaro.org>
Tue, 26 Aug 2025 15:15:41 +0000 (09:15 -0600)
Use device life-cycle managed runtime enable function to simplify probe
and exit paths.

Signed-off-by: Andrew Davis <afd@ti.com>
Link: https://lore.kernel.org/r/20250814140835.651652-2-afd@ti.com
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
drivers/remoteproc/keystone_remoteproc.c

index 6fc27e0d7b3def7c3fd05803e33208967abe8b5d..558678d793b0df57e46c6b9adfacb9cced9d364b 100644 (file)
@@ -401,12 +401,13 @@ static int keystone_rproc_probe(struct platform_device *pdev)
                return PTR_ERR(ksproc->reset);
 
        /* enable clock for accessing DSP internal memories */
-       pm_runtime_enable(dev);
+       ret = devm_pm_runtime_enable(dev);
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "Failed to enable runtime PM\n");
+
        ret = pm_runtime_resume_and_get(dev);
-       if (ret < 0) {
-               dev_err(dev, "failed to enable clock, status = %d\n", ret);
-               goto disable_rpm;
-       }
+       if (ret < 0)
+               return dev_err_probe(dev, ret, "failed to enable clock\n");
 
        ret = keystone_rproc_of_get_memories(pdev, ksproc);
        if (ret)
@@ -466,8 +467,6 @@ release_mem:
        gpiod_put(ksproc->kick_gpio);
 disable_clk:
        pm_runtime_put_sync(dev);
-disable_rpm:
-       pm_runtime_disable(dev);
        return ret;
 }
 
@@ -478,7 +477,6 @@ static void keystone_rproc_remove(struct platform_device *pdev)
        rproc_del(ksproc->rproc);
        gpiod_put(ksproc->kick_gpio);
        pm_runtime_put_sync(&pdev->dev);
-       pm_runtime_disable(&pdev->dev);
 }
 
 static const struct of_device_id keystone_rproc_of_match[] = {