[media] exynos-gsc: Simplify system PM

It's not needed to keep a local flag about the current system PM state.
Let's just remove that code and the corresponding debug print.

[mszyprow: rebased onto v4.9-rc4]

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
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>

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 3ac588f5c558ba1c50a9c3c595283e2ae6b6b8d5..5aeb8b44eacd0299f054098ff9f81fd58f82b51c 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -1182,20 +1182,6 @@ static int gsc_runtime_suspend(struct device *dev)
 #ifdef CONFIG_PM_SLEEP
 static int gsc_resume(struct device *dev)
 {
-       struct gsc_dev *gsc = dev_get_drvdata(dev);
-       unsigned long flags;
-
-       pr_debug("gsc%d: state: 0x%lx", gsc->id, gsc->state);
-
-       /* Do not resume if the device was idle before system suspend */
-       spin_lock_irqsave(&gsc->slock, flags);
-       if (!test_and_clear_bit(ST_SUSPEND, &gsc->state) ||
-           !gsc_m2m_opened(gsc)) {
-               spin_unlock_irqrestore(&gsc->slock, flags);
-               return 0;
-       }
-       spin_unlock_irqrestore(&gsc->slock, flags);
-
        if (!pm_runtime_suspended(dev))
                return gsc_runtime_resume(dev);
 
@@ -1204,13 +1190,6 @@ static int gsc_resume(struct device *dev)
 
 static int gsc_suspend(struct device *dev)
 {
-       struct gsc_dev *gsc = dev_get_drvdata(dev);
-
-       pr_debug("gsc%d: state: 0x%lx", gsc->id, gsc->state);
-
-       if (test_and_set_bit(ST_SUSPEND, &gsc->state))
-               return 0;
-
        if (!pm_runtime_suspended(dev))
                return gsc_runtime_suspend(dev);
 

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index 7ad7b9dc224373e30ab07018802128ce51eef351..8480aec054419c380526912a20eef9f0c9df3b66 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -48,9 +48,6 @@
 #define        GSC_CTX_ABORT                   (1 << 7)
 
 enum gsc_dev_flags {
-       /* for global */
-       ST_SUSPEND,
-
        /* for m2m node */
        ST_M2M_OPEN,
        ST_M2M_RUN,