rtc: rtc-sa1100: use devm_*() functions

Use devm_*() functions to make cleanup paths simpler.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c
index 7e0a0887c2567c50c4050b8f02962163604bdad5..00605601dbf7eb53d874973eb11a6031b1273e58 100644 (file)
--- a/drivers/rtc/rtc-sa1100.c
+++ b/drivers/rtc/rtc-sa1100.c
@@ -234,14 +234,13 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
        if (irq_1hz < 0 || irq_alarm < 0)
                return -ENODEV;
 
-       info = kzalloc(sizeof(struct sa1100_rtc), GFP_KERNEL);
+       info = devm_kzalloc(&pdev->dev, sizeof(struct sa1100_rtc), GFP_KERNEL);
        if (!info)
                return -ENOMEM;
-       info->clk = clk_get(&pdev->dev, NULL);
+       info->clk = devm_clk_get(&pdev->dev, NULL);
        if (IS_ERR(info->clk)) {
                dev_err(&pdev->dev, "failed to find rtc clock source\n");
-               ret = PTR_ERR(info->clk);
-               goto err_clk;
+               return PTR_ERR(info->clk);
        }
        info->irq_1hz = irq_1hz;
        info->irq_alarm = irq_alarm;
@@ -268,8 +267,8 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
 
        device_init_wakeup(&pdev->dev, 1);
 
-       rtc = rtc_device_register(pdev->name, &pdev->dev, &sa1100_rtc_ops,
-               THIS_MODULE);
+       rtc = devm_rtc_device_register(&pdev->dev, pdev->name, &sa1100_rtc_ops,
+                                       THIS_MODULE);
 
        if (IS_ERR(rtc)) {
                ret = PTR_ERR(rtc);
@@ -306,9 +305,6 @@ err_dev:
        clk_disable_unprepare(info->clk);
 err_enable_clk:
        platform_set_drvdata(pdev, NULL);
-       clk_put(info->clk);
-err_clk:
-       kfree(info);
        return ret;
 }
 
@@ -317,11 +313,8 @@ static int sa1100_rtc_remove(struct platform_device *pdev)
        struct sa1100_rtc *info = platform_get_drvdata(pdev);
 
        if (info) {
-               rtc_device_unregister(info->rtc);
                clk_disable_unprepare(info->clk);
-               clk_put(info->clk);
                platform_set_drvdata(pdev, NULL);
-               kfree(info);
        }
 
        return 0;