leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[media] s5p-jpeg: use clk_prepare_enable and clk_disable_unprepare

Browse Source 
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>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Thomas Abraham 2012-10-02 20:55:02 -03:00 committed by Mauro Carvalho Chehab
parent 1309b33683
commit 2c4c03f381
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/media/platform/s5p-jpeg/jpeg-core.c
View File

@ -1353,7 +1353,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
return ret; return ret;
} }
dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk); dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk);
clk_enable(jpeg->clk); clk_prepare_enable(jpeg->clk);
/* v4l2 device */ /* v4l2 device */
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev); ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
@ -1460,7 +1460,7 @@ device_register_rollback:
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
clk_get_rollback: clk_get_rollback:
clk_disable(jpeg->clk); clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk); clk_put(jpeg->clk);
return ret; return ret;
@ -1480,7 +1480,7 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
v4l2_m2m_release(jpeg->m2m_dev); v4l2_m2m_release(jpeg->m2m_dev);
v4l2_device_unregister(&jpeg->v4l2_dev); v4l2_device_unregister(&jpeg->v4l2_dev);
clk_disable(jpeg->clk); clk_disable_unprepare(jpeg->clk);
clk_put(jpeg->clk); clk_put(jpeg->clk);
return 0; return 0;