aboutsummaryrefslogtreecommitdiff
path: root/drivers/thermal
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-04-18 11:37:58 +0000
committerZhang Rui <rui.zhang@intel.com>2013-04-24 23:37:19 +0800
commit2a16279c68bcfa34e4fe960b8276dd2d08c2e24c (patch)
tree936f4241984b9aabc110b17c230a369c3c535bd9 /drivers/thermal
parent3912a677f68f6084e0a7b6a1a29310ac1b083713 (diff)
downloadvexpress-lsk-2a16279c68bcfa34e4fe960b8276dd2d08c2e24c.tar.gz
Thermal: exynos: Add clk_{un}prepare APIs
clk_{un}prepare APIs are required to migrate to common clock framework. While at it convert to use devm_clk_get as it removes some cleanup code. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Cc: Amit Daniel Kachhap <amit.daniel@samsung.com> Acked-by: Eduardo Valentin <eduardo.valentin@ti.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/exynos_thermal.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c
index 46568c078de..055cd60b839 100644
--- a/drivers/thermal/exynos_thermal.c
+++ b/drivers/thermal/exynos_thermal.c
@@ -985,12 +985,16 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return ret;
}
- data->clk = clk_get(NULL, "tmu_apbif");
+ data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
if (IS_ERR(data->clk)) {
dev_err(&pdev->dev, "Failed to get clock\n");
return PTR_ERR(data->clk);
}
+ ret = clk_prepare(data->clk);
+ if (ret)
+ return ret;
+
if (pdata->type == SOC_ARCH_EXYNOS ||
pdata->type == SOC_ARCH_EXYNOS4210)
data->soc = pdata->type;
@@ -1046,7 +1050,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
return 0;
err_clk:
platform_set_drvdata(pdev, NULL);
- clk_put(data->clk);
+ clk_unprepare(data->clk);
return ret;
}
@@ -1060,7 +1064,7 @@ static int exynos_tmu_remove(struct platform_device *pdev)
exynos_unregister_thermal();
- clk_put(data->clk);
+ clk_unprepare(data->clk);
platform_set_drvdata(pdev, NULL);