* [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get()
@ 2013-04-29 9:15 Jingoo Han
2013-04-29 16:32 ` Guenter Roeck
2013-05-25 19:51 ` Wim Van Sebroeck
0 siblings, 2 replies; 3+ messages in thread
From: Jingoo Han @ 2013-04-29 9:15 UTC (permalink / raw)
To: 'Andrew Morton'
Cc: linux-kernel, 'Wim Van Sebroeck', linux-watchdog, Jingoo Han
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get()
2013-04-29 9:15 [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get() Jingoo Han
@ 2013-04-29 16:32 ` Guenter Roeck
2013-05-25 19:51 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2013-04-29 16:32 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Andrew Morton', linux-kernel, 'Wim Van Sebroeck',
linux-watchdog
On Mon, Apr 29, 2013 at 06:15:26PM +0900, Jingoo Han wrote:
> 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>
> ---
> 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
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get()
2013-04-29 9:15 [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get() Jingoo Han
2013-04-29 16:32 ` Guenter Roeck
@ 2013-05-25 19:51 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2013-05-25 19:51 UTC (permalink / raw)
To: Jingoo Han; +Cc: 'Andrew Morton', linux-kernel, linux-watchdog
Hi Jingoo,
> 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(-)
>
Patch added to linux-watchdog-next.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-25 19:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-29 9:15 [PATCH RESEND 1/5] watchdog: dw_wdt: use devm_clk_get() Jingoo Han
2013-04-29 16:32 ` Guenter Roeck
2013-05-25 19:51 ` Wim Van Sebroeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®