Skip to content

Commit

Permalink
OMAPDSS: DSI: Use devm_clk_get()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sachin Kamat authored and Tomi Valkeinen committed Apr 10, 2013
1 parent 48c2169 commit 5303b3a
Showing 1 changed file with 2 additions and 17 deletions.
19 changes: 2 additions & 17 deletions drivers/video/omap2/dss/dsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -5073,19 +5073,17 @@ static int dsi_get_clocks(struct platform_device *dsidev)
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
struct clk *clk;

clk = clk_get(&dsidev->dev, "fck");
clk = devm_clk_get(&dsidev->dev, "fck");
if (IS_ERR(clk)) {
DSSERR("can't get fck\n");
return PTR_ERR(clk);
}

dsi->dss_clk = clk;

clk = clk_get(&dsidev->dev, "sys_clk");
clk = devm_clk_get(&dsidev->dev, "sys_clk");
if (IS_ERR(clk)) {
DSSERR("can't get sys_clk\n");
clk_put(dsi->dss_clk);
dsi->dss_clk = NULL;
return PTR_ERR(clk);
}

Expand All @@ -5094,16 +5092,6 @@ static int dsi_get_clocks(struct platform_device *dsidev)
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)
{
struct omap_dss_board_info *pdata = pdev->dev.platform_data;
Expand Down Expand Up @@ -5314,7 +5302,6 @@ static int __init omap_dsihw_probe(struct platform_device *dsidev)

err_runtime_get:
pm_runtime_disable(&dsidev->dev);
dsi_put_clocks(dsidev);
return r;
}

Expand All @@ -5330,8 +5317,6 @@ static int __exit omap_dsihw_remove(struct platform_device *dsidev)

pm_runtime_disable(&dsidev->dev);

dsi_put_clocks(dsidev);

if (dsi->vdds_dsi_reg != NULL) {
if (dsi->vdds_dsi_enabled) {
regulator_disable(dsi->vdds_dsi_reg);
Expand Down

0 comments on commit 5303b3a

Please sign in to comment.