9 files changed, 44 insertions, 56 deletions

diff --git a/drivers/mtd/devices/spear_smi.c b/drivers/mtd/devices/spear_smi.c
index 2aabd96bf0ff..8a82b8bc21e1 100644
--- a/drivers/mtd/devices/spear_smi.c
+++ b/drivers/mtd/devices/spear_smi.c
@@ -949,10 +949,9 @@ static int spear_smi_probe(struct platform_device *pdev)
 
         smi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        dev->io_base = devm_request_and_ioremap(&pdev->dev, smi_base);
-        if (!dev->io_base) {
-                ret = -EIO;
-                dev_err(&pdev->dev, "devm_request_and_ioremap fail\n");
+        dev->io_base = devm_ioremap_resource(&pdev->dev, smi_base);
+        if (IS_ERR(dev->io_base)) {
+                ret = PTR_ERR(dev->io_base);
                 goto err;
         }
 
diff --git a/drivers/mtd/maps/autcpu12-nvram.c b/drivers/mtd/maps/autcpu12-nvram.c
index a2dc2ae4b24e..c3525d2a2fa8 100644
--- a/drivers/mtd/maps/autcpu12-nvram.c
+++ b/drivers/mtd/maps/autcpu12-nvram.c
@@ -16,6 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include <linux/err.h>
 #include <linux/sizes.h>
 
 #include <linux/types.h>
@@ -55,12 +56,10 @@ static int autcpu12_nvram_probe(struct platform_device *pdev)
         priv->map.bankwidth     = 4;
         priv->map.phys          = res->start;
         priv->map.size          = resource_size(res);
-        priv->map.virt          = devm_request_and_ioremap(&pdev->dev, res);
+        priv->map.virt = devm_ioremap_resource(&pdev->dev, res);
         strcpy((char *)priv->map.name, res->name);
-        if (!priv->map.virt) {
-                dev_err(&pdev->dev, "failed to remap mem resource\n");
-                return -EBUSY;
-        }
+        if (IS_ERR(priv->map.virt))
+                return PTR_ERR(priv->map.virt);
 
         simple_map_init(&priv->map);
 
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index 3c3c791eb96a..d1da6ede3845 100644
--- a/drivers/mtd/maps/lantiq-flash.c
+++ b/drivers/mtd/maps/lantiq-flash.c
@@ -7,6 +7,7 @@
  *  Copyright (C) 2010 John Crispin <blogic@openwrt.org>
  */
 
+#include <linux/err.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -136,10 +137,9 @@ ltq_mtd_probe(struct platform_device *pdev)
         ltq_mtd->map = kzalloc(sizeof(struct map_info), GFP_KERNEL);
         ltq_mtd->map->phys = ltq_mtd->res->start;
         ltq_mtd->map->size = resource_size(ltq_mtd->res);
-        ltq_mtd->map->virt = devm_request_and_ioremap(&pdev->dev, ltq_mtd->res);
-        if (!ltq_mtd->map->virt) {
-                dev_err(&pdev->dev, "failed to remap mem resource\n");
-                err = -EBUSY;
+        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;
         }
 
diff --git a/drivers/mtd/nand/fsmc_nand.c b/drivers/mtd/nand/fsmc_nand.c
index 67e62d3d495c..c543cc09f193 100644
--- a/drivers/mtd/nand/fsmc_nand.c
+++ b/drivers/mtd/nand/fsmc_nand.c
@@ -937,42 +937,35 @@ static int __init fsmc_nand_probe(struct platform_device *pdev)
         if (!res)
                 return -EINVAL;
 
-        host->data_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->data_va) {
-                dev_err(&pdev->dev, "data ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->data_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->data_va))
+                return PTR_ERR(host->data_va);
+        
         host->data_pa = (dma_addr_t)res->start;
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_addr");
         if (!res)
                 return -EINVAL;
 
-        host->addr_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->addr_va) {
-                dev_err(&pdev->dev, "ale ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->addr_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->addr_va))
+                return PTR_ERR(host->addr_va);
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "nand_cmd");
         if (!res)
                 return -EINVAL;
 
-        host->cmd_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->cmd_va) {
-                dev_err(&pdev->dev, "ale ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->cmd_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->cmd_va))
+                return PTR_ERR(host->cmd_va);
 
         res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fsmc_regs");
         if (!res)
                 return -EINVAL;
 
-        host->regs_va = devm_request_and_ioremap(&pdev->dev, res);
-        if (!host->regs_va) {
-                dev_err(&pdev->dev, "regs ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->regs_va = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(host->regs_va))
+                return PTR_ERR(host->regs_va);
 
         host->clk = clk_get(&pdev->dev, NULL);
         if (IS_ERR(host->clk)) {
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index f182befa7360..0ca22ae9135c 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -677,11 +677,10 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
                 return -ENXIO;
         }
 
-        host->io_base = devm_request_and_ioremap(&pdev->dev, rc);
-        if (host->io_base == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -EIO;
-        }
+        host->io_base = devm_ioremap_resource(&pdev->dev, rc);
+        if (IS_ERR(host->io_base))
+                return PTR_ERR(host->io_base);
+        
         host->io_base_phy = rc->start;
 
         mtd = &host->mtd;
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index 030b78c62895..be94ed5abefb 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -778,11 +778,9 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
         }
         host->io_base_dma = rc->start;
 
-        host->io_base = devm_request_and_ioremap(&pdev->dev, rc);
-        if (host->io_base == NULL) {
-                dev_err(&pdev->dev, "ioremap failed\n");
-                return -ENOMEM;
-        }
+        host->io_base = devm_ioremap_resource(&pdev->dev, rc);
+        if (IS_ERR(host->io_base))
+                return PTR_ERR(host->io_base);
 
         if (pdev->dev.of_node)
                 host->ncfg = lpc32xx_parse_dt(&pdev->dev);
diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c
index 45204e41a028..60ac5b98b718 100644
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@@ -1437,9 +1437,9 @@ static int mxcnd_probe(struct platform_device *pdev)
                 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);