hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Ulf Hansson 2016-11-09 12:23:57 -02:00 committed by Mauro Carvalho Chehab
parent 7ebcb3e842
commit 701a8de6ef
2 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/media/platform/exynos-gsc/gsc-core.c
View File

@ -1182,20 +1182,6 @@ static int gsc_runtime_suspend(struct device *dev)
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
static int gsc_resume(struct device *dev) 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)) if (!pm_runtime_suspended(dev))
return gsc_runtime_resume(dev); return gsc_runtime_resume(dev);
@ -1204,13 +1190,6 @@ static int gsc_resume(struct device *dev)
static int gsc_suspend(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)) if (!pm_runtime_suspended(dev))
return gsc_runtime_suspend(dev); return gsc_runtime_suspend(dev);

3
drivers/media/platform/exynos-gsc/gsc-core.h
View File

@ -48,9 +48,6 @@
#define GSC_CTX_ABORT (1 << 7) #define GSC_CTX_ABORT (1 << 7)
enum gsc_dev_flags { enum gsc_dev_flags {
/* for global */
ST_SUSPEND,
/* for m2m node */ /* for m2m node */
ST_M2M_OPEN, ST_M2M_OPEN,
ST_M2M_RUN, ST_M2M_RUN,