watchdog: dw_wdt: use devm_clk_get()
PATCH RESEND 1/5 watchdog: dw_wdt: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/watchdog/dw_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/watchdog/dw_wdt.c +2 -5
@@ -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 ; }
Signature · 1 line
1.7.2.5
Quoted 3 lines · Jingoo Han
Use
devm_clk_get()to make cleanup paths more simple.Signed-off-by Jingoo Han <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Quoted 50 lines
--- drivers/watchdog/dw_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)drivers/watchdog/dw_wdt.c +2
-5@@ -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 ; }Signature · 7 lines
1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Jingoo,
Quoted 7 lines
Use
devm_clk_get()to make cleanup paths more simple.Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/dw_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
Patch added to linux-watchdog-next.
Kind regards,
Wim.