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

OMAPDSS: DSI: Use devm_clk_get()

Browse Source 
Using devm_clk_get cleans up some code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Sachin Kamat 2013-04-02 14:33:00 +03:00 committed by Tomi Valkeinen
parent 48c2169fd9
commit 5303b3aa77
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/video/omap2/dss/dsi.c
View File

@ -5073,7 +5073,7 @@ static int dsi_get_clocks(struct platform_device *dsidev)
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev); struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
struct clk *clk; struct clk *clk;
clk = clk_get(&dsidev->dev, "fck"); clk = devm_clk_get(&dsidev->dev, "fck");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
DSSERR("can't get fck\n"); DSSERR("can't get fck\n");
return PTR_ERR(clk); return PTR_ERR(clk);
@ -5081,11 +5081,9 @@ static int dsi_get_clocks(struct platform_device *dsidev)
dsi->dss_clk = clk; dsi->dss_clk = clk;
clk = clk_get(&dsidev->dev, "sys_clk"); clk = devm_clk_get(&dsidev->dev, "sys_clk");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
DSSERR("can't get sys_clk\n"); DSSERR("can't get sys_clk\n");
clk_put(dsi->dss_clk);
dsi->dss_clk = NULL;
return PTR_ERR(clk); return PTR_ERR(clk);
} }
@ -5094,16 +5092,6 @@ static int dsi_get_clocks(struct platform_device *dsidev)
return 0; return 0;
} }
static void dsi_put_clocks(struct platform_device *dsidev)
{
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
if (dsi->dss_clk)
clk_put(dsi->dss_clk);
if (dsi->sys_clk)
clk_put(dsi->sys_clk);
}
static struct omap_dss_device * __init dsi_find_dssdev(struct platform_device *pdev) static struct omap_dss_device * __init dsi_find_dssdev(struct platform_device *pdev)
{ {
struct omap_dss_board_info *pdata = pdev->dev.platform_data; struct omap_dss_board_info *pdata = pdev->dev.platform_data;
@ -5314,7 +5302,6 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev)
err_runtime_get: err_runtime_get:
pm_runtime_disable(&dsidev->dev); pm_runtime_disable(&dsidev->dev);
dsi_put_clocks(dsidev);
return r; return r;
} }
@ -5330,8 +5317,6 @@ static int __exit omap_dsihw_remove(struct platform_device *dsidev)
pm_runtime_disable(&dsidev->dev); pm_runtime_disable(&dsidev->dev);
dsi_put_clocks(dsidev);
if (dsi->vdds_dsi_reg != NULL) { if (dsi->vdds_dsi_reg != NULL) {
if (dsi->vdds_dsi_enabled) { if (dsi->vdds_dsi_enabled) {
regulator_disable(dsi->vdds_dsi_reg); regulator_disable(dsi->vdds_dsi_reg);