diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-12-27 09:38:24 -0500 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-03-01 06:21:24 -0500 |
commit | 5071a88475b758bf60191e53606463fe7290c71e (patch) | |
tree | 2aadc6ed5d1daf3637673516cc6a905513400ee5 /drivers/watchdog | |
parent | 41adafbd7b84c66c2cdad857b75d5d45032310a6 (diff) |
watchdog: ath79_wdt: convert to use devm_clk_get
Use the managed version of clk_get. This allows to
simplify the probe/remove functions a bit.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/ath79_wdt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/watchdog/ath79_wdt.c b/drivers/watchdog/ath79_wdt.c index 38a999e60c0d..dcd18ec1821b 100644 --- a/drivers/watchdog/ath79_wdt.c +++ b/drivers/watchdog/ath79_wdt.c | |||
@@ -229,13 +229,13 @@ static int ath79_wdt_probe(struct platform_device *pdev) | |||
229 | u32 ctrl; | 229 | u32 ctrl; |
230 | int err; | 230 | int err; |
231 | 231 | ||
232 | wdt_clk = clk_get(&pdev->dev, "wdt"); | 232 | wdt_clk = devm_clk_get(&pdev->dev, "wdt"); |
233 | if (IS_ERR(wdt_clk)) | 233 | if (IS_ERR(wdt_clk)) |
234 | return PTR_ERR(wdt_clk); | 234 | return PTR_ERR(wdt_clk); |
235 | 235 | ||
236 | err = clk_enable(wdt_clk); | 236 | err = clk_enable(wdt_clk); |
237 | if (err) | 237 | if (err) |
238 | goto err_clk_put; | 238 | return err; |
239 | 239 | ||
240 | wdt_freq = clk_get_rate(wdt_clk); | 240 | wdt_freq = clk_get_rate(wdt_clk); |
241 | if (!wdt_freq) { | 241 | if (!wdt_freq) { |
@@ -265,8 +265,6 @@ static int ath79_wdt_probe(struct platform_device *pdev) | |||
265 | 265 | ||
266 | err_clk_disable: | 266 | err_clk_disable: |
267 | clk_disable(wdt_clk); | 267 | clk_disable(wdt_clk); |
268 | err_clk_put: | ||
269 | clk_put(wdt_clk); | ||
270 | return err; | 268 | return err; |
271 | } | 269 | } |
272 | 270 | ||
@@ -274,7 +272,6 @@ static int ath79_wdt_remove(struct platform_device *pdev) | |||
274 | { | 272 | { |
275 | misc_deregister(&ath79_wdt_miscdev); | 273 | misc_deregister(&ath79_wdt_miscdev); |
276 | clk_disable(wdt_clk); | 274 | clk_disable(wdt_clk); |
277 | clk_put(wdt_clk); | ||
278 | return 0; | 275 | return 0; |
279 | } | 276 | } |
280 | 277 | ||