[PATCH 5/6] media: s5p-cec: fix system and runtime pm integration
Marek Szyprowski
m.szyprowski at samsung.com
Wed Aug 31 12:55:58 UTC 2016
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 at samsung.com>
---
drivers/staging/media/s5p-cec/s5p_cec.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/drivers/staging/media/s5p-cec/s5p_cec.c b/drivers/staging/media/s5p-cec/s5p_cec.c
index 78333273c4e5..77d9887801b8 100644
--- a/drivers/staging/media/s5p-cec/s5p_cec.c
+++ b/drivers/staging/media/s5p-cec/s5p_cec.c
@@ -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)
};
--
1.9.1
More information about the dri-devel
mailing list