diff options
| author | Archit Taneja | 2013-04-08 10:55:00 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2013-04-10 14:02:54 +0200 |
| commit | b2c9c8ee7cec4c7d8fa90375f9de92ecf3045ebb (patch) | |
| tree | 33b24a8d65318bcbaa6036410a7715af283f39d1 /drivers/video/omap2/dss/venc.c | |
| parent | OMAPDSS: nec-nl8048 panel: Use dev_pm_ops (diff) | |
| download | kernel-qcow2-linux-b2c9c8ee7cec4c7d8fa90375f9de92ecf3045ebb.tar.gz kernel-qcow2-linux-b2c9c8ee7cec4c7d8fa90375f9de92ecf3045ebb.tar.xz kernel-qcow2-linux-b2c9c8ee7cec4c7d8fa90375f9de92ecf3045ebb.zip | |
omapdss: use devm_clk_get()
Use devm_clk_get() instead of clk_get() for dss, and for outputs hdmi
and venc. This reduces code and simplifies error handling.
Signed-off-by: Archit Taneja <archit@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 006caf3cb509..c27ab6ff5a37 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -721,7 +721,7 @@ static int venc_get_clocks(struct platform_device *pdev) struct clk *clk; if (dss_has_feature(FEAT_VENC_REQUIRES_TV_DAC_CLK)) { - clk = clk_get(&pdev->dev, "tv_dac_clk"); + clk = devm_clk_get(&pdev->dev, "tv_dac_clk"); if (IS_ERR(clk)) { DSSERR("can't get tv_dac_clk\n"); return PTR_ERR(clk); @@ -735,12 +735,6 @@ static int venc_get_clocks(struct platform_device *pdev) return 0; } -static void venc_put_clocks(void) -{ - if (venc.tv_dac_clk) - clk_put(venc.tv_dac_clk); -} - static struct omap_dss_device * __init venc_find_dssdev(struct platform_device *pdev) { struct omap_dss_board_info *pdata = pdev->dev.platform_data; @@ -886,7 +880,6 @@ static int __init omap_venchw_probe(struct platform_device *pdev) err_panel_init: err_runtime_get: pm_runtime_disable(&pdev->dev); - venc_put_clocks(); return r; } @@ -904,7 +897,6 @@ static int __exit omap_venchw_remove(struct platform_device *pdev) venc_uninit_output(pdev); pm_runtime_disable(&pdev->dev); - venc_put_clocks(); return 0; } |