watchdog: sp805_wdt: use devm_clk_get()
PATCH RESEND 5/5 watchdog: sp805_wdt: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/watchdog/sp805_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/watchdog/sp805_wdt.c +2 -5
@@ -231,7 +231,7 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) goto err; } - wdt->clk =clk_get (&adev->dev,NULL ); + wdt->clk =devm_clk_get (&adev->dev,NULL );if (IS_ERR (wdt->clk)) {dev_warn (&adev->dev,"Clock not found\n" ); ret =PTR_ERR (wdt->clk);
@@ -251,15 +251,13 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)if (ret) {dev_err (&adev->dev,"watchdog_register_device() failed: %d\n" , ret); - goto err_register; + goto err; }amba_set_drvdata (adev, wdt);dev_info (&adev->dev,"registration successful\n" );return 0 ; -err_register: -clk_put (wdt->clk); err:dev_err (&adev->dev,"Probe Failed!!!\n" );return ret;
@@ -272,7 +270,6 @@ static int sp805_wdt_remove(struct amba_device *adev)watchdog_unregister_device (&wdt->wdd);amba_set_drvdata (adev,NULL );watchdog_set_drvdata (&wdt->wdd,NULL ); -clk_put (wdt->clk);return 0 ; }
Signature · 1 line
1.7.2.5
Quoted 6 lines · Jingoo Han
Use
devm_clk_get()to make cleanup paths more simple.Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/sp805_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
You should have used get_maintainers.pl for getting the cc list.
Acked-by Viresh Kumar <[email protected]>
Hi Jingoo,
Quoted 7 lines
Use
devm_clk_get()to make cleanup paths more simple.Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/sp805_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
Patch added to linux-watchdog-next.
Kind regards,
Wim.