diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2012-12-07 11:29:32 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2013-01-04 15:38:25 +0800 |
| commit | 03b79bda8d061d80a6106e257c072a2754141bab (patch) | |
| tree | 7efbfbfcdf9e4b4af9f2cd4e605571763b2906dc /drivers/thermal | |
| parent | d2a73e225d113fdccd80373ad9aeb2b58b32a30b (diff) | |
| download | op-kernel-dev-03b79bda8d061d80a6106e257c072a2754141bab.zip op-kernel-dev-03b79bda8d061d80a6106e257c072a2754141bab.tar.gz | |
drivers/thermal/spear_thermal.c: use devm_clk_get
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>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/spear_thermal.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c index 6b2d8b2..3c5ee56 100644 --- a/drivers/thermal/spear_thermal.c +++ b/drivers/thermal/spear_thermal.c @@ -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); @@ -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; @@ -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; } @@ -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; } |
