1 files changed, 9 insertions, 17 deletions

diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 42d844f8f6bf..dfbf3f270cea 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -19,7 +19,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/concat.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define MAX_RESOURCES           4
 
@@ -27,7 +27,6 @@ struct physmap_flash_info {
         struct mtd_info         *mtd[MAX_RESOURCES];
         struct mtd_info         *cmtd;
         struct map_info         map[MAX_RESOURCES];
-        struct resource         *res;
 #ifdef CONFIG_MTD_PARTITIONS
         int                     nr_parts;
         struct mtd_partition    *parts;
@@ -70,16 +69,7 @@ static int physmap_flash_remove(struct platform_device *dev)
 #endif
                         map_destroy(info->mtd[i]);
                 }
-
-                if (info->map[i].virt != NULL)
-                        iounmap(info->map[i].virt);
-        }
-
-        if (info->res != NULL) {
-                release_resource(info->res);
-                kfree(info->res);
         }
-
         return 0;
 }
 
@@ -101,7 +91,8 @@ static int physmap_flash_probe(struct platform_device *dev)
         if (physmap_data == NULL)
                 return -ENODEV;
 
-        info = kzalloc(sizeof(struct physmap_flash_info), GFP_KERNEL);
+        info = devm_kzalloc(&dev->dev, sizeof(struct physmap_flash_info),
+                            GFP_KERNEL);
         if (info == NULL) {
                 err = -ENOMEM;
                 goto err_out;
@@ -114,10 +105,10 @@ static int physmap_flash_probe(struct platform_device *dev)
                        (unsigned long long)(dev->resource[i].end - dev->resource[i].start + 1),
                        (unsigned long long)dev->resource[i].start);
 
-                info->res = request_mem_region(dev->resource[i].start,
-                                               dev->resource[i].end - dev->resource[i].start + 1,
-                                               dev->dev.bus_id);
-                if (info->res == NULL) {
+                if (!devm_request_mem_region(&dev->dev,
+                        dev->resource[i].start,
+                        dev->resource[i].end - dev->resource[i].start + 1,
+                        dev->dev.bus_id)) {
                         dev_err(&dev->dev, "Could not reserve memory region\n");
                         err = -ENOMEM;
                         goto err_out;
@@ -129,7 +120,8 @@ static int physmap_flash_probe(struct platform_device *dev)
                 info->map[i].bankwidth = physmap_data->width;
                 info->map[i].set_vpp = physmap_data->set_vpp;
 
-                info->map[i].virt = ioremap(info->map[i].phys, info->map[i].size);
+                info->map[i].virt = devm_ioremap(&dev->dev, info->map[i].phys,
+                                                 info->map[i].size);
                 if (info->map[i].virt == NULL) {
                         dev_err(&dev->dev, "Failed to ioremap flash region\n");
                         err = EIO;