summaryrefslogtreecommitdiff
path: root/drivers/media/platform
diff options
context:
space:
mode:
authorMarek Szyprowski <m.szyprowski@samsung.com>2016-11-09 17:23:58 +0300
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-11-16 21:34:21 +0300
commit8098f9ca949006578d8127cbaa46a84699066959 (patch)
tree849f13395f223a797d704fcd518e315400b261a4 /drivers/media/platform
parent701a8de6ef4ee1a5000144cc7d66ecc343598e14 (diff)
downloadlinux-8098f9ca949006578d8127cbaa46a84699066959.tar.xz
[media] exynos-gsc: Simplify system PM even more
System PM callbacks only ensure that device is runtime suspended/resumed, so remove them and use generic pm_runtime_force_suspend/resume helper. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org> Tested-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/platform')
-rw-r--r--drivers/media/platform/exynos-gsc/gsc-core.c21
1 files changed, 2 insertions, 19 deletions
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 5aeb8b44eacd..45a62216385a 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1179,26 +1179,9 @@ static int gsc_runtime_suspend(struct device *dev)
}
#endif
-#ifdef CONFIG_PM_SLEEP
-static int gsc_resume(struct device *dev)
-{
- if (!pm_runtime_suspended(dev))
- return gsc_runtime_resume(dev);
-
- return 0;
-}
-
-static int gsc_suspend(struct device *dev)
-{
- if (!pm_runtime_suspended(dev))
- return gsc_runtime_suspend(dev);
-
- return 0;
-}
-#endif
-
static const struct dev_pm_ops gsc_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(gsc_suspend, gsc_resume)
+ SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+ pm_runtime_force_resume)
SET_RUNTIME_PM_OPS(gsc_runtime_suspend, gsc_runtime_resume, NULL)
};