rtc: rtc-davinci: use devm_kzalloc()

Use devm_kzalloc() and remove the error path free and the unload free as
devm functions take care of freeing resources.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Miguel Aguilar <miguel.aguilar@ridgerun.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-davinci.c b/drivers/rtc/rtc-davinci.c
index fd95316743c9f5ed8785c94fc235fd4357274ebb..07cd03eae60605f1c993ce585182ad0dd5f33c96 100644 (file)
--- a/drivers/rtc/rtc-davinci.c
+++ b/drivers/rtc/rtc-davinci.c
@@ -485,7 +485,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        struct resource *res, *mem;
        int ret = 0;
 
-       davinci_rtc = kzalloc(sizeof(struct davinci_rtc), GFP_KERNEL);
+       davinci_rtc = devm_kzalloc(&pdev->dev, sizeof(struct davinci_rtc), GFP_KERNEL);
        if (!davinci_rtc) {
                dev_dbg(dev, "could not allocate memory for private data\n");
                return -ENOMEM;
@@ -494,15 +494,13 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        davinci_rtc->irq = platform_get_irq(pdev, 0);
        if (davinci_rtc->irq < 0) {
                dev_err(dev, "no RTC irq\n");
-               ret = davinci_rtc->irq;
-               goto fail1;
+               return davinci_rtc->irq;
        }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {
                dev_err(dev, "no mem resource\n");
-               ret = -EINVAL;
-               goto fail1;
+               return -EINVAL;
        }
 
        davinci_rtc->pbase = res->start;
@@ -513,8 +511,7 @@ static int __init davinci_rtc_probe(struct platform_device *pdev)
        if (!mem) {
                dev_err(dev, "RTC registers at %08x are not free\n",
                        davinci_rtc->pbase);
-               ret = -EBUSY;
-               goto fail1;
+               return -EBUSY;
        }
 
        davinci_rtc->base = ioremap(davinci_rtc->pbase, davinci_rtc->base_size);
@@ -567,9 +564,6 @@ fail3:
        iounmap(davinci_rtc->base);
 fail2:
        release_mem_region(davinci_rtc->pbase, davinci_rtc->base_size);
-fail1:
-       kfree(davinci_rtc);
-
        return ret;
 }
 
@@ -590,8 +584,6 @@ static int __devexit davinci_rtc_remove(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, NULL);
 
-       kfree(davinci_rtc);
-
        return 0;
 }