summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/s5p-jpeg/jpeg-core.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 5600f701f88..e40fed755bf 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1850,25 +1850,9 @@ static int s5p_jpeg_runtime_resume(struct device *dev)
return 0;
}
-static int s5p_jpeg_suspend(struct device *dev)
-{
- struct s5p_jpeg *jpeg = dev_get_drvdata(dev);
- clk_disable_unprepare(jpeg->clk);
- s5p_jpeg_runtime_suspend(dev);
- return 0;
-}
-
-static int s5p_jpeg_resume(struct device *dev)
-{
- struct s5p_jpeg *jpeg = dev_get_drvdata(dev);
- clk_prepare_enable(jpeg->clk);
- s5p_jpeg_runtime_resume(dev);
- return 0;
-}
-
static const struct dev_pm_ops s5p_jpeg_pm_ops = {
- SET_SYSTEM_SLEEP_PM_OPS(s5p_jpeg_suspend, s5p_jpeg_resume)
- SET_RUNTIME_PM_OPS(s5p_jpeg_runtime_suspend, s5p_jpeg_runtime_resume, NULL)
+ .runtime_suspend = s5p_jpeg_runtime_suspend,
+ .runtime_resume = s5p_jpeg_runtime_resume,
};
#ifdef CONFIG_OF