watchdog: imx2_wdt: use devm_clk_get()
Subsystems (2)
PATCH RESEND 2/5 watchdog: imx2_wdt: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/watchdog/imx2_wdt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
drivers/watchdog/imx2_wdt.c +2 -4
@@ -266,7 +266,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)if (IS_ERR (imx2_wdt.base))return PTR_ERR (imx2_wdt.base); - imx2_wdt.clk =clk_get (&pdev->dev,NULL ); + imx2_wdt.clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (imx2_wdt.clk)) {dev_err (&pdev->dev,"can't get Watchdog clock\n" );return PTR_ERR (imx2_wdt.clk);
@@ -291,7 +291,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) fail: imx2_wdt_miscdev.parent =NULL ; -clk_put (imx2_wdt.clk);return ret; }
@@ -304,8 +303,7 @@ static int __exit imx2_wdt_remove(struct platform_device *pdev)dev_crit (imx2_wdt_miscdev.parent,"Device removed: Expect reboot!\n" ); - }else -clk_put (imx2_wdt.clk); + } imx2_wdt_miscdev.parent =NULL ;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 44 lines
--- drivers/watchdog/imx2_wdt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)drivers/watchdog/imx2_wdt.c +2
-4@@ -266,7 +266,7 @@ static int __init imx2_wdt_probe(struct platform_device *pdev)if (IS_ERR (imx2_wdt.base))return PTR_ERR (imx2_wdt.base); - imx2_wdt.clk =clk_get (&pdev->dev,NULL ); + imx2_wdt.clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (imx2_wdt.clk)) {dev_err (&pdev->dev,"can't get Watchdog clock\n" );return PTR_ERR (imx2_wdt.clk);@@ -291,7 +291,6 @@ static int __init imx2_wdt_probe(struct platform_device *pdev) fail: imx2_wdt_miscdev.parent =NULL ; -clk_put (imx2_wdt.clk);return ret; }@@ -304,8 +303,7 @@ static int __exit imx2_wdt_remove(struct platform_device *pdev)dev_crit (imx2_wdt_miscdev.parent,"Device removed: Expect reboot!\n" ); - }else -clk_put (imx2_wdt.clk); + } imx2_wdt_miscdev.parent =NULL ;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/imx2_wdt.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
Patch added to linux-watchdog-next.
Kind regards,
Wim.