aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-02-21 19:45:35 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-21 20:22:30 -0500
commit9510853cfde2223ef39b4a7fbbb7fb100d780661 (patch)
tree4fc5285cd8032e498d50bd9177bf6b28b8f6c227
parentee4433573b02f817c3ac62ed8f07027938dc9201 (diff)
rtc: rtc-imxdi: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple. Signed-off-by: Jingoo Han <jg1.han@samsung.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/rtc/rtc-imxdi.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-imxdi.c b/drivers/rtc/rtc-imxdi.c
index 75d307ab37f4..82aad695979e 100644
--- a/drivers/rtc/rtc-imxdi.c
+++ b/drivers/rtc/rtc-imxdi.c
@@ -406,7 +406,7 @@ static int dryice_rtc_probe(struct platform_device *pdev)
406 406
407 mutex_init(&imxdi->write_mutex); 407 mutex_init(&imxdi->write_mutex);
408 408
409 imxdi->clk = clk_get(&pdev->dev, NULL); 409 imxdi->clk = devm_clk_get(&pdev->dev, NULL);
410 if (IS_ERR(imxdi->clk)) 410 if (IS_ERR(imxdi->clk))
411 return PTR_ERR(imxdi->clk); 411 return PTR_ERR(imxdi->clk);
412 clk_prepare_enable(imxdi->clk); 412 clk_prepare_enable(imxdi->clk);
@@ -475,7 +475,6 @@ static int dryice_rtc_probe(struct platform_device *pdev)
475 475
476err: 476err:
477 clk_disable_unprepare(imxdi->clk); 477 clk_disable_unprepare(imxdi->clk);
478 clk_put(imxdi->clk);
479 478
480 return rc; 479 return rc;
481} 480}
@@ -492,7 +491,6 @@ static int dryice_rtc_remove(struct platform_device *pdev)
492 rtc_device_unregister(imxdi->rtc); 491 rtc_device_unregister(imxdi->rtc);
493 492
494 clk_disable_unprepare(imxdi->clk); 493 clk_disable_unprepare(imxdi->clk);
495 clk_put(imxdi->clk);
496 494
497 return 0; 495 return 0;
498} 496}