fbdev: omapfb/dss: Use pm_runtime_resume_and_get() instead of pm_runtime_get_sync()

Using the newest pm_runtime_resume_and_get is more appropriate
for simplifing code here.

Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
index b2d6e6df2161563667a5d5369cf6f3885ebc56fe..92fb6b7e1f6818ec8cb7d76418e6abcc7c31bd27 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dispc.c
@@ -519,11 +519,9 @@ int dispc_runtime_get(void)
 
        DSSDBG("dispc_runtime_get\n");
 
-       r = pm_runtime_get_sync(&dispc.pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&dispc.pdev->dev);
+       r = pm_runtime_resume_and_get(&dispc.pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
        return 0;
 }
 EXPORT_SYMBOL(dispc_runtime_get);

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
index d43b081d592f0101f396c8a157c1cc69f1dca455..54b0f034c2edfdf0c0fa2a50a911646eeefd70e9 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dsi.c
@@ -1136,11 +1136,9 @@ static int dsi_runtime_get(struct platform_device *dsidev)
 
        DSSDBG("dsi_runtime_get\n");
 
-       r = pm_runtime_get_sync(&dsi->pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&dsi->pdev->dev);
+       r = pm_runtime_resume_and_get(&dsi->pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
        return 0;
 }
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/dss.c b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
index 45b9d3cf3860218c9193f2eb7f5adbc42baad8d2..335e0af4eec1a0bc05d4d6bb621a52a9249612d8 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/dss.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/dss.c
@@ -767,11 +767,9 @@ int dss_runtime_get(void)
 
        DSSDBG("dss_runtime_get\n");
 
-       r = pm_runtime_get_sync(&dss.pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&dss.pdev->dev);
+       r = pm_runtime_resume_and_get(&dss.pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
        return 0;
 }
 

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
index 800bd108e834d4b721983f80cb753451a4c8caa2..0f39612e002e8aeebdb1cf2bff7d5f2012c96811 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c
@@ -38,11 +38,9 @@ static int hdmi_runtime_get(void)
 
        DSSDBG("hdmi_runtime_get\n");
 
-       r = pm_runtime_get_sync(&hdmi.pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&hdmi.pdev->dev);
+       r = pm_runtime_resume_and_get(&hdmi.pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
 
        return 0;
 }

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
index 2c03608addcd788f6742244b34dd0bd3ca89b5e2..bfccc2cb917af583608f9393ae9763bb521bc855 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c
@@ -42,11 +42,9 @@ static int hdmi_runtime_get(void)
 
        DSSDBG("hdmi_runtime_get\n");
 
-       r = pm_runtime_get_sync(&hdmi.pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&hdmi.pdev->dev);
+       r = pm_runtime_resume_and_get(&hdmi.pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
 
        return 0;
 }

diff --git a/drivers/video/fbdev/omap2/omapfb/dss/venc.c b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
index 905d642ff9ed70afaa08b4e0dc0d599e00b4c120..78a7309d25dd3e1815b3c7ca55464bbb6481ca6d 100644 (file)
--- a/drivers/video/fbdev/omap2/omapfb/dss/venc.c
+++ b/drivers/video/fbdev/omap2/omapfb/dss/venc.c
@@ -347,11 +347,9 @@ static int venc_runtime_get(void)
 
        DSSDBG("venc_runtime_get\n");
 
-       r = pm_runtime_get_sync(&venc.pdev->dev);
-       if (WARN_ON(r < 0)) {
-               pm_runtime_put_sync(&venc.pdev->dev);
+       r = pm_runtime_resume_and_get(&venc.pdev->dev);
+       if (WARN_ON(r < 0))
                return r;
-       }
        return 0;
 }