[PATCH v2 3/3] drm/mediatek: Use devm variant for pm_runtime_enable() when possible

[AngeloGioacchino Del Regno]

Simplify the error path of return functions and drop the call to
pm_runtime_disable() in remove functions by switching to
devm_pm_runtime_enable() where possible.

Signed-off-by: AngeloGioacchino Del Regno 
<angelogioacchino.delre...@collabora.com>
Reviewed-by: Alexandre Mergnat <amerg...@baylibre.com>
Reviewed-by: CK Hu <ck...@mediatek.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c |  9 ++++-----
 drivers/gpu/drm/mediatek/mtk_disp_rdma.c        | 11 ++++-------
 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c         | 10 +++++-----
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c 
b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
index 1993b688befa..14e8ad6c78c3 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
@@ -519,13 +519,13 @@ static int mtk_disp_ovl_adaptor_probe(struct 
platform_device *pdev)
 
        component_master_add_with_match(dev, &mtk_disp_ovl_adaptor_master_ops, 
match);
 
-       pm_runtime_enable(dev);
+       ret = devm_pm_runtime_enable(dev);
+       if (ret)
+               return ret;
 
        ret = component_add(dev, &mtk_disp_ovl_adaptor_comp_ops);
-       if (ret) {
-               pm_runtime_disable(dev);
+       if (ret)
                return dev_err_probe(dev, ret, "Failed to add component\n");
-       }
 
        return 0;
 }
@@ -533,7 +533,6 @@ static int mtk_disp_ovl_adaptor_probe(struct 
platform_device *pdev)
 static int mtk_disp_ovl_adaptor_remove(struct platform_device *pdev)
 {
        component_master_del(&pdev->dev, &mtk_disp_ovl_adaptor_master_ops);
-       pm_runtime_disable(&pdev->dev);
        return 0;
 }
 
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c 
b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
index cfbc037a0f6d..0469076cf715 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_rdma.c
@@ -360,13 +360,13 @@ static int mtk_disp_rdma_probe(struct platform_device 
*pdev)
 
        platform_set_drvdata(pdev, priv);
 
-       pm_runtime_enable(dev);
+       ret = devm_pm_runtime_enable(dev);
+       if (ret)
+               return ret;
 
        ret = component_add(dev, &mtk_disp_rdma_component_ops);
-       if (ret) {
-               pm_runtime_disable(dev);
+       if (ret)
                return dev_err_probe(dev, ret, "Failed to add component\n");
-       }
 
        return 0;
 }
@@ -374,9 +374,6 @@ static int mtk_disp_rdma_probe(struct platform_device *pdev)
 static int mtk_disp_rdma_remove(struct platform_device *pdev)
 {
        component_del(&pdev->dev, &mtk_disp_rdma_component_ops);
-
-       pm_runtime_disable(&pdev->dev);
-
        return 0;
 }
 
diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c 
b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
index ae05d9660592..a5d811c37207 100644
--- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
@@ -299,20 +299,20 @@ static int mtk_mdp_rdma_probe(struct platform_device 
*pdev)
 #endif
        platform_set_drvdata(pdev, priv);
 
-       pm_runtime_enable(dev);
+       ret = devm_pm_runtime_enable(dev);
+       if (ret)
+               return ret;
 
        ret = component_add(dev, &mtk_mdp_rdma_component_ops);
-       if (ret) {
-               pm_runtime_disable(dev);
+       if (ret)
                return dev_err_probe(dev, ret, "Failed to add component\n");
-       }
+
        return 0;
 }
 
 static int mtk_mdp_rdma_remove(struct platform_device *pdev)
 {
        component_del(&pdev->dev, &mtk_mdp_rdma_component_ops);
-       pm_runtime_disable(&pdev->dev);
        return 0;
 }
 
-- 
2.40.1