watchdog: pnx4008_wdt: use devm_clk_get()
Subsystems (2)
PATCH RESEND 3/5 watchdog: pnx4008_wdt: use devm_clk_get()
Use devm_clk_get() to make cleanup paths more simple.
Signed-off-by Jingoo Han <[email protected]>
--- drivers/watchdog/pnx4008_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
drivers/watchdog/pnx4008_wdt.c +2 -5
@@ -159,13 +159,13 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)if (IS_ERR (wdt_base))return PTR_ERR (wdt_base); - wdt_clk =clk_get (&pdev->dev,NULL ); + wdt_clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (wdt_clk))return PTR_ERR (wdt_clk); ret =clk_enable (wdt_clk);if (ret) - goto out; +return ret; pnx4008_wdd.bootstatus = (readl (WDTIM_RES (wdt_base)) &WDOG_RESET ) ?WDIOF_CARDRESET :0 ;
@@ -186,8 +186,6 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) disable_clk:clk_disable (wdt_clk); -out: -clk_put (wdt_clk);return ret; }
@@ -196,7 +194,6 @@ static int pnx4008_wdt_remove(struct platform_device *pdev)watchdog_unregister_device (&pnx4008_wdd);clk_disable (wdt_clk); -clk_put (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/pnx4008_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)drivers/watchdog/pnx4008_wdt.c +2
-5@@ -159,13 +159,13 @@ static int pnx4008_wdt_probe(struct platform_device *pdev)if (IS_ERR (wdt_base))return PTR_ERR (wdt_base); - wdt_clk =clk_get (&pdev->dev,NULL ); + wdt_clk =devm_clk_get (&pdev->dev,NULL );if (IS_ERR (wdt_clk))return PTR_ERR (wdt_clk); ret =clk_enable (wdt_clk);if (ret) - goto out; +return ret; pnx4008_wdd.bootstatus = (readl (WDTIM_RES (wdt_base)) &WDOG_RESET ) ?WDIOF_CARDRESET :0 ;@@ -186,8 +186,6 @@ static int pnx4008_wdt_probe(struct platform_device *pdev) disable_clk:clk_disable (wdt_clk); -out: -clk_put (wdt_clk);return ret; }@@ -196,7 +194,6 @@ static int pnx4008_wdt_remove(struct platform_device *pdev)watchdog_unregister_device (&pnx4008_wdd);clk_disable (wdt_clk); -clk_put (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/pnx4008_wdt.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
Patch added to linux-watchdog-next.
Kind regards,
Wim.