diff options
| author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-05 16:02:32 +0100 |
|---|---|---|
| committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 12:01:08 +0900 |
| commit | c71011a79c196c5a732c454a186328d888f06d31 (patch) | |
| tree | db23d398d138b4598a970bc6036b08bbc3d72d17 | |
| parent | 2d8b6f8a445e5c0afb0e1134827b025ea5b44130 (diff) | |
| download | linux-3.10-c71011a79c196c5a732c454a186328d888f06d31.tar.gz linux-3.10-c71011a79c196c5a732c454a186328d888f06d31.tar.bz2 linux-3.10-c71011a79c196c5a732c454a186328d888f06d31.zip | |
Revert "media: s5p-jpeg: fix clock management in suspend/resume path"
This reverts commit 3754f529b2efb8ef65b27e440bb57399179c0e02.
Mainline patches solve the problem.
Change-Id: I6a7eb9a1bd815131c197c64c7b2c791ba17c4cb2
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
| -rw-r--r-- | drivers/media/platform/s5p-jpeg/jpeg-core.c | 20 |
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 |