mmc: dw_mmc: Use devm_* functions in dw_mmc platform driver

Use devm_* managed functions for simpler error handling.

Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: Will Newton <will.newton@imgtec.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

1 files changed, 8 insertions, 21 deletions

diff --git a/drivers/mmc/host/dw_mmc-pltfm.c b/drivers/mmc/host/dw_mmc-pltfm.c
index 528d37b93651..ce7be1ac6621 100644
--- a/drivers/mmc/host/dw_mmc-pltfm.c
+++ b/drivers/mmc/host/dw_mmc-pltfm.c
@@ -27,38 +27,27 @@ static int __devinit dw_mci_pltfm_probe(struct platform_device *pdev)
         struct resource *regs;
         int ret;
 
-        host = kzalloc(sizeof(struct dw_mci), GFP_KERNEL);
+        host = devm_kzalloc(&pdev->dev, sizeof(struct dw_mci), GFP_KERNEL);
         if (!host)
                 return -ENOMEM;
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!regs) {
-                ret = -ENXIO;
-                goto err_free;
-        }
+        if (!regs)
+                return -ENXIO;
 
         host->irq = platform_get_irq(pdev, 0);
-        if (host->irq < 0) {
-                ret = host->irq;
-                goto err_free;
-        }
+        if (host->irq < 0)
+                return host->irq;
 
         host->dev = &pdev->dev;
         host->irq_flags = 0;
         host->pdata = pdev->dev.platform_data;
-        ret = -ENOMEM;
-        host->regs = ioremap(regs->start, resource_size(regs));
+        host->regs = devm_request_and_ioremap(&pdev->dev, regs);
         if (!host->regs)
-                goto err_free;
+                return -ENOMEM;
+
         platform_set_drvdata(pdev, host);
         ret = dw_mci_probe(host);
-        if (ret)
-                goto err_out;
-        return ret;
-err_out:
-        iounmap(host->regs);
-err_free:
-        kfree(host);
         return ret;
 }
 
@@ -68,8 +57,6 @@ static int __devexit dw_mci_pltfm_remove(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, NULL);
         dw_mci_remove(host);
-        iounmap(host->regs);
-        kfree(host);
         return 0;
 }