* [PATCH RESEND 4/5] watchdog: shwdt: use devm_clk_get()
@ 2013-04-29 9:16 Jingoo Han
2013-04-29 16:34 ` Guenter Roeck
2013-05-25 20:36 ` Wim Van Sebroeck
0 siblings, 2 replies; 3+ messages in thread
From: Jingoo Han @ 2013-04-29 9:16 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/shwdt.c | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
index 6185af2..ea2154b 100644
--- a/drivers/watchdog/shwdt.c
+++ b/drivers/watchdog/shwdt.c
@@ -241,7 +241,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
wdt->dev = &pdev->dev;
- wdt->clk = clk_get(&pdev->dev, NULL);
+ wdt->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(wdt->clk)) {
/*
* Clock framework support is optional, continue on
@@ -251,10 +251,8 @@ static int sh_wdt_probe(struct platform_device *pdev)
}
wdt->base = devm_ioremap_resource(wdt->dev, res);
- if (IS_ERR(wdt->base)) {
- rc = PTR_ERR(wdt->base);
- goto err;
- }
+ if (IS_ERR(wdt->base))
+ return PTR_ERR(wdt->base);
watchdog_set_nowayout(&sh_wdt_dev, nowayout);
watchdog_set_drvdata(&sh_wdt_dev, wdt);
@@ -277,7 +275,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
rc = watchdog_register_device(&sh_wdt_dev);
if (unlikely(rc)) {
dev_err(&pdev->dev, "Can't register watchdog (err=%d)\n", rc);
- goto err;
+ return rc;
}
init_timer(&wdt->timer);
@@ -292,11 +290,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
return 0;
-
-err:
- clk_put(wdt->clk);
-
- return rc;
}
static int sh_wdt_remove(struct platform_device *pdev)
@@ -308,7 +301,6 @@ static int sh_wdt_remove(struct platform_device *pdev)
watchdog_unregister_device(&sh_wdt_dev);
pm_runtime_disable(&pdev->dev);
- clk_put(wdt->clk);
return 0;
}
--
1.7.2.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH RESEND 4/5] watchdog: shwdt: use devm_clk_get()
2013-04-29 9:16 [PATCH RESEND 4/5] watchdog: shwdt: use devm_clk_get() Jingoo Han
@ 2013-04-29 16:34 ` Guenter Roeck
2013-05-25 20:36 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2013-04-29 16:34 UTC (permalink / raw)
To: Jingoo Han
Cc: 'Andrew Morton', linux-kernel, 'Wim Van Sebroeck',
linux-watchdog
On Mon, Apr 29, 2013 at 06:16:33PM +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/shwdt.c | 16 ++++------------
> 1 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/watchdog/shwdt.c b/drivers/watchdog/shwdt.c
> index 6185af2..ea2154b 100644
> --- a/drivers/watchdog/shwdt.c
> +++ b/drivers/watchdog/shwdt.c
> @@ -241,7 +241,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
>
> wdt->dev = &pdev->dev;
>
> - wdt->clk = clk_get(&pdev->dev, NULL);
> + wdt->clk = devm_clk_get(&pdev->dev, NULL);
> if (IS_ERR(wdt->clk)) {
> /*
> * Clock framework support is optional, continue on
> @@ -251,10 +251,8 @@ static int sh_wdt_probe(struct platform_device *pdev)
> }
>
> wdt->base = devm_ioremap_resource(wdt->dev, res);
> - if (IS_ERR(wdt->base)) {
> - rc = PTR_ERR(wdt->base);
> - goto err;
> - }
> + if (IS_ERR(wdt->base))
> + return PTR_ERR(wdt->base);
>
> watchdog_set_nowayout(&sh_wdt_dev, nowayout);
> watchdog_set_drvdata(&sh_wdt_dev, wdt);
> @@ -277,7 +275,7 @@ static int sh_wdt_probe(struct platform_device *pdev)
> rc = watchdog_register_device(&sh_wdt_dev);
> if (unlikely(rc)) {
> dev_err(&pdev->dev, "Can't register watchdog (err=%d)\n", rc);
> - goto err;
> + return rc;
> }
>
> init_timer(&wdt->timer);
> @@ -292,11 +290,6 @@ static int sh_wdt_probe(struct platform_device *pdev)
> pm_runtime_enable(&pdev->dev);
>
> return 0;
> -
> -err:
> - clk_put(wdt->clk);
> -
> - return rc;
> }
>
> static int sh_wdt_remove(struct platform_device *pdev)
> @@ -308,7 +301,6 @@ static int sh_wdt_remove(struct platform_device *pdev)
> watchdog_unregister_device(&sh_wdt_dev);
>
> pm_runtime_disable(&pdev->dev);
> - clk_put(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 4/5] watchdog: shwdt: use devm_clk_get()
2013-04-29 9:16 [PATCH RESEND 4/5] watchdog: shwdt: use devm_clk_get() Jingoo Han
2013-04-29 16:34 ` Guenter Roeck
@ 2013-05-25 20:36 ` Wim Van Sebroeck
1 sibling, 0 replies; 3+ messages in thread
From: Wim Van Sebroeck @ 2013-05-25 20:36 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/shwdt.c | 16 ++++------------
> 1 files changed, 4 insertions(+), 12 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 20:36 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:16 [PATCH RESEND 4/5] watchdog: shwdt: use devm_clk_get() Jingoo Han
2013-04-29 16:34 ` Guenter Roeck
2013-05-25 20:36 ` 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®