diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 05:16:14 -0400 |
---|---|---|
committer | Wim Van Sebroeck <wim@iguana.be> | 2013-07-11 15:01:53 -0400 |
commit | 259181feb003e3244d4ba15256735ca259be217a (patch) | |
tree | 5ecb6c9eac237050d85881fb6b78909dcbd4934c /drivers/watchdog | |
parent | bdf495742716211259dba644e0950129db6f2641 (diff) |
watchdog: pnx4008_wdt: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple.
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r-- | drivers/watchdog/pnx4008_wdt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index a3684a30eb69..b30bd430f591 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
@@ -159,13 +159,13 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) | |||
159 | if (IS_ERR(wdt_base)) | 159 | if (IS_ERR(wdt_base)) |
160 | return PTR_ERR(wdt_base); | 160 | return PTR_ERR(wdt_base); |
161 | 161 | ||
162 | wdt_clk = clk_get(&pdev->dev, NULL); | 162 | wdt_clk = devm_clk_get(&pdev->dev, NULL); |
163 | if (IS_ERR(wdt_clk)) | 163 | if (IS_ERR(wdt_clk)) |
164 | return PTR_ERR(wdt_clk); | 164 | return PTR_ERR(wdt_clk); |
165 | 165 | ||
166 | ret = clk_enable(wdt_clk); | 166 | ret = clk_enable(wdt_clk); |
167 | if (ret) | 167 | if (ret) |
168 | goto out; | 168 | return ret; |
169 | 169 | ||
170 | pnx4008_wdd.bootstatus = (readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ? | 170 | pnx4008_wdd.bootstatus = (readl(WDTIM_RES(wdt_base)) & WDOG_RESET) ? |
171 | WDIOF_CARDRESET : 0; | 171 | WDIOF_CARDRESET : 0; |
@@ -186,8 +186,6 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) | |||
186 | 186 | ||
187 | disable_clk: | 187 | disable_clk: |
188 | clk_disable(wdt_clk); | 188 | clk_disable(wdt_clk); |
189 | out: | ||
190 | clk_put(wdt_clk); | ||
191 | return ret; | 189 | return ret; |
192 | } | 190 | } |
193 | 191 | ||
@@ -196,7 +194,6 @@ static int pnx4008_wdt_remove(struct platform_device *pdev) | |||
196 | watchdog_unregister_device(&pnx4008_wdd); | 194 | watchdog_unregister_device(&pnx4008_wdd); |
197 | 195 | ||
198 | clk_disable(wdt_clk); | 196 | clk_disable(wdt_clk); |
199 | clk_put(wdt_clk); | ||
200 | 197 | ||
201 | return 0; | 198 | return 0; |
202 | } | 199 | } |