Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mtd / maps / lantiq-flash.c

diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index d7ac65d..7aa682c 100644 (file)
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -13,7 +13,6 @@
 #include <linux/kernel.h>
 #include <linux/io.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
@@ -123,24 +122,28 @@ ltq_mtd_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       ltq_mtd = kzalloc(sizeof(struct ltq_mtd), GFP_KERNEL);
+       ltq_mtd = devm_kzalloc(&pdev->dev, sizeof(struct ltq_mtd), GFP_KERNEL);
+       if (!ltq_mtd)
+               return -ENOMEM;
+
        platform_set_drvdata(pdev, ltq_mtd);
 
        ltq_mtd->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!ltq_mtd->res) {
                dev_err(&pdev->dev, "failed to get memory resource\n");
-               err = -ENOENT;
-               goto err_out;
+               return -ENOENT;
        }
 
-       ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
+       ltq_mtd->map = devm_kzalloc(&pdev->dev, sizeof(struct map_info),
+                                   GFP_KERNEL);
+       if (!ltq_mtd->map)
+               return -ENOMEM;
+
        ltq_mtd->map->phys = ltq_mtd->res->start;
        ltq_mtd->map->size = resource_size(ltq_mtd->res);
        ltq_mtd->map->virt = devm_ioremap_resource(&pdev->dev, ltq_mtd->res);
-       if (IS_ERR(ltq_mtd->map->virt)) {
-               err = PTR_ERR(ltq_mtd->map->virt);
-               goto err_out;
-       }
+       if (IS_ERR(ltq_mtd->map->virt))
+               return PTR_ERR(ltq_mtd->map->virt);
 
        ltq_mtd->map->name = ltq_map_name;
        ltq_mtd->map->bankwidth = 2;
@@ -155,8 +158,7 @@ ltq_mtd_probe(struct platform_device *pdev)
 
        if (!ltq_mtd->mtd) {
                dev_err(&pdev->dev, "probing failed\n");
-               err = -ENXIO;
-               goto err_free;
+               return -ENXIO;
        }
 
        ltq_mtd->mtd->owner = THIS_MODULE;
@@ -177,10 +179,6 @@ ltq_mtd_probe(struct platform_device *pdev)
 
 err_destroy:
        map_destroy(ltq_mtd->mtd);
-err_free:
-       kfree(ltq_mtd->map);
-err_out:
-       kfree(ltq_mtd);
        return err;
 }
 
@@ -189,13 +187,9 @@ ltq_mtd_remove(struct platform_device *pdev)
 {
        struct ltq_mtd *ltq_mtd = platform_get_drvdata(pdev);
 
-       if (ltq_mtd) {
-               if (ltq_mtd->mtd) {
-                       mtd_device_unregister(ltq_mtd->mtd);
-                       map_destroy(ltq_mtd->mtd);
-               }
-               kfree(ltq_mtd->map);
-               kfree(ltq_mtd);
+       if (ltq_mtd && ltq_mtd->mtd) {
+               mtd_device_unregister(ltq_mtd->mtd);
+               map_destroy(ltq_mtd->mtd);
        }
        return 0;
 }