aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal/spear_thermal.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-12-07 05:29:32 -0500
committerZhang Rui <rui.zhang@intel.com>2013-01-04 02:38:25 -0500
commit03b79bda8d061d80a6106e257c072a2754141bab (patch)
tree7efbfbfcdf9e4b4af9f2cd4e605571763b2906dc /drivers/thermal/spear_thermal.c
parentd2a73e225d113fdccd80373ad9aeb2b58b32a30b (diff)
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/spear_thermal.c')
-rw-r--r--drivers/thermal/spear_thermal.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/thermal/spear_thermal.c b/drivers/thermal/spear_thermal.c
index 6b2d8b21aaee..3c5ee5607977 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)
131 return -ENOMEM; 131 return -ENOMEM;
132 } 132 }
133 133
134 stdev->clk = clk_get(&pdev->dev, NULL); 134 stdev->clk = devm_clk_get(&pdev->dev, NULL);
135 if (IS_ERR(stdev->clk)) { 135 if (IS_ERR(stdev->clk)) {
136 dev_err(&pdev->dev, "Can't get clock\n"); 136 dev_err(&pdev->dev, "Can't get clock\n");
137 return PTR_ERR(stdev->clk); 137 return PTR_ERR(stdev->clk);
@@ -140,7 +140,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
140 ret = clk_enable(stdev->clk); 140 ret = clk_enable(stdev->clk);
141 if (ret) { 141 if (ret) {
142 dev_err(&pdev->dev, "Can't enable clock\n"); 142 dev_err(&pdev->dev, "Can't enable clock\n");
143 goto put_clk; 143 return ret;
144 } 144 }
145 145
146 stdev->flags = val; 146 stdev->flags = val;
@@ -163,8 +163,6 @@ static int spear_thermal_probe(struct platform_device *pdev)
163 163
164disable_clk: 164disable_clk:
165 clk_disable(stdev->clk); 165 clk_disable(stdev->clk);
166put_clk:
167 clk_put(stdev->clk);
168 166
169 return ret; 167 return ret;
170} 168}
@@ -183,7 +181,6 @@ static int spear_thermal_exit(struct platform_device *pdev)
183 writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base); 181 writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);
184 182
185 clk_disable(stdev->clk); 183 clk_disable(stdev->clk);
186 clk_put(stdev->clk);
187 184
188 return 0; 185 return 0;
189} 186}