* [PATCH] [media] s5p-jpeg: use clk_prepare_enable and clk_disable_unprepare
@ 2012-10-02 23:55 Thomas Abraham
2012-10-03 10:17 ` Sylwester Nawrocki
0 siblings, 1 reply; 2+ messages in thread
From: Thomas Abraham @ 2012-10-02 23:55 UTC (permalink / raw)
To: linux-media; +Cc: mchehab, andrzej.p, kgene.kim, linux-samsung-soc
Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
calls as required by common clock framework.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
---
drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index 90459cef..9df35b2 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1353,7 +1353,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
return ret;
}
dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk);
- clk_enable(jpeg->clk);
+ clk_prepare_enable(jpeg->clk);
/* v4l2 device */
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
@@ -1459,7 +1459,7 @@ device_register_rollback:
v4l2_device_unregister(&jpeg->v4l2_dev);
clk_get_rollback:
- clk_disable(jpeg->clk);
+ clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk);
return ret;
@@ -1479,7 +1479,7 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev);
- clk_disable(jpeg->clk);
+ clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk);
return 0;
--
1.7.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] [media] s5p-jpeg: use clk_prepare_enable and clk_disable_unprepare
2012-10-02 23:55 [PATCH] [media] s5p-jpeg: use clk_prepare_enable and clk_disable_unprepare Thomas Abraham
@ 2012-10-03 10:17 ` Sylwester Nawrocki
0 siblings, 0 replies; 2+ messages in thread
From: Sylwester Nawrocki @ 2012-10-03 10:17 UTC (permalink / raw)
To: Thomas Abraham
Cc: linux-media, mchehab, andrzej.p, kgene.kim, linux-samsung-soc
On 10/03/2012 01:55 AM, Thomas Abraham wrote:
> Convert clk_enable/clk_disable to clk_prepare_enable/clk_disable_unprepare
> calls as required by common clock framework.
>
> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-10-03 10:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-02 23:55 [PATCH] [media] s5p-jpeg: use clk_prepare_enable and clk_disable_unprepare Thomas Abraham
2012-10-03 10:17 ` Sylwester Nawrocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).