Skip to content

Commit

Permalink
drivers/thermal/spear_thermal.c: use devm_clk_get
Browse files Browse the repository at this point in the history
devm_clk_get allocates a resource that is released when a driver detaches.
This patch uses devm_clk_get for data that is allocated in the probe
function of a platform device and is only released in the remove function.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
  • Loading branch information
Julia Lawall authored and Zhang Rui committed Jan 4, 2013
1 parent d2a73e2 commit 03b79bd
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/thermal/spear_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
return -ENOMEM;
}

stdev->clk = clk_get(&pdev->dev, NULL);
stdev->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(stdev->clk)) {
dev_err(&pdev->dev, "Can't get clock\n");
return PTR_ERR(stdev->clk);
Expand All @@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
ret = clk_enable(stdev->clk);
if (ret) {
dev_err(&pdev->dev, "Can't enable clock\n");
goto put_clk;
return ret;
}

stdev->flags = val;
Expand All @@ -163,8 +163,6 @@ static int spear_thermal_probe(struct platform_device *pdev)

disable_clk:
clk_disable(stdev->clk);
put_clk:
clk_put(stdev->clk);

return ret;
}
Expand All @@ -183,7 +181,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);

clk_disable(stdev->clk);
clk_put(stdev->clk);

return 0;
}
Expand Down

0 comments on commit 03b79bd

Please sign in to comment.