mmc: omap: Convert to devm_kzalloc
authorJarkko Nikula <jarkko.nikula@bitmer.com>
Sat, 22 Feb 2014 16:01:38 +0000 (18:01 +0200)
committerChris Ball <chris@printf.net>
Sat, 22 Feb 2014 18:17:18 +0000 (13:17 -0500)
Signed-off-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Chris Ball <chris@printf.net>
drivers/mmc/host/omap.c

index 42b665dfaa731d3bd9f1b5d7c49ceaa7b5c260b5..927ed24d0708eea6122b0a829851be8c2f5d0915 100644 (file)
@@ -1345,7 +1345,8 @@ static int mmc_omap_probe(struct platform_device *pdev)
        if (res == NULL)
                return -EBUSY;
 
-       host = kzalloc(sizeof(struct mmc_omap_host), GFP_KERNEL);
+       host = devm_kzalloc(&pdev->dev, sizeof(struct mmc_omap_host),
+                           GFP_KERNEL);
        if (host == NULL) {
                ret = -ENOMEM;
                goto err_free_mem_region;
@@ -1465,7 +1466,6 @@ err_free_iclk:
 err_free_mmc_host:
        iounmap(host->virt_base);
 err_ioremap:
-       kfree(host);
 err_free_mem_region:
        release_mem_region(res->start, resource_size(res));
        return ret;
@@ -1500,8 +1500,6 @@ static int mmc_omap_remove(struct platform_device *pdev)
                           pdev->resource[0].end - pdev->resource[0].start + 1);
        destroy_workqueue(host->mmc_omap_wq);
 
-       kfree(host);
-
        return 0;
 }