Skip to content

Commit

Permalink
[media] s5p-cec: fix system and runtime PM integration
Browse files Browse the repository at this point in the history
Use generic helpers instead of open-coding usage of runtime PM for system
sleep PM, which was potentially broken for some corner cases.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Marek Szyprowski authored and Mauro Carvalho Chehab committed Sep 22, 2016
1 parent 3b92fed commit 57b978a
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions drivers/staging/media/s5p-cec/s5p_cec.c
Original file line number Diff line number Diff line change
Expand Up @@ -250,22 +250,9 @@ static int s5p_cec_runtime_resume(struct device *dev)
return 0;
}

static int __maybe_unused s5p_cec_suspend(struct device *dev)
{
if (pm_runtime_suspended(dev))
return 0;
return s5p_cec_runtime_suspend(dev);
}

static int __maybe_unused s5p_cec_resume(struct device *dev)
{
if (pm_runtime_suspended(dev))
return 0;
return s5p_cec_runtime_resume(dev);
}

static const struct dev_pm_ops s5p_cec_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(s5p_cec_suspend, s5p_cec_resume)
SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
pm_runtime_force_resume)
SET_RUNTIME_PM_OPS(s5p_cec_runtime_suspend, s5p_cec_runtime_resume,
NULL)
};
Expand Down

0 comments on commit 57b978a

Please sign in to comment.