lkml.org 
[lkml]   [2013]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get()
Date
Use devm_clk_get() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
---
drivers/watchdog/dw_wdt.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/watchdog/dw_wdt.c b/drivers/watchdog/dw_wdt.c
index 2037669..2e70fd0 100644
--- a/drivers/watchdog/dw_wdt.c
+++ b/drivers/watchdog/dw_wdt.c
@@ -305,13 +305,13 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)
if (IS_ERR(dw_wdt.regs))
return PTR_ERR(dw_wdt.regs);

- dw_wdt.clk = clk_get(&pdev->dev, NULL);
+ dw_wdt.clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(dw_wdt.clk))
return PTR_ERR(dw_wdt.clk);

ret = clk_enable(dw_wdt.clk);
if (ret)
- goto out_put_clk;
+ return ret;

spin_lock_init(&dw_wdt.lock);

@@ -327,8 +327,6 @@ static int dw_wdt_drv_probe(struct platform_device *pdev)

out_disable_clk:
clk_disable(dw_wdt.clk);
-out_put_clk:
- clk_put(dw_wdt.clk);

return ret;
}
@@ -338,7 +336,6 @@ static int dw_wdt_drv_remove(struct platform_device *pdev)
misc_deregister(&dw_wdt_miscdev);

clk_disable(dw_wdt.clk);
- clk_put(dw_wdt.clk);

return 0;
}
--
1.7.2.5



\
 
 \ /
  Last update: 2013-04-29 12:01    [W:0.036 / U:1.752 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site