[PATCH RESEND 2/5] watchdog: imx2_wdt: use devm_clk_get()

[Jingoo Han]

Use devm_clk_get() to make cleanup paths more simple.

Signed-off-by: Jingoo Han <jg1....@samsung.com>
---
 drivers/watchdog/imx2_wdt.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index ff90882..0c2b075 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -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;
-- 
1.7.2.5


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/