Commit b0e07060 authored by Zhang Qilong's avatar Zhang Qilong Committed by Helge Deller
Browse files

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: default avatarZhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 2559f17e

drivers/video/fbdev/omap2/omapfb/dss/dispc.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

drivers/video/fbdev/omap2/omapfb/dss/dsi.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/fbdev/omap2/omapfb/dss/dss.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}

drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

}