6 files changed, 12 insertions, 11 deletions

diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c
index d4297a97e100..67815eed2f00 100644
--- a/drivers/mtd/maps/bfin-async-flash.c
+++ b/drivers/mtd/maps/bfin-async-flash.c
@@ -142,7 +142,7 @@ static int __devinit bfin_flash_probe(struct platform_device *pdev)
         state->map.write      = bfin_flash_write;
         state->map.copy_to    = bfin_flash_copy_to;
         state->map.bankwidth  = pdata->width;
-        state->map.size       = memory->end - memory->start + 1;
+        state->map.size       = resource_size(memory);
         state->map.virt       = (void __iomem *)memory->start;
         state->map.phys       = memory->start;
         state->map.map_priv_1 = (unsigned long)state;
diff --git a/drivers/mtd/maps/ixp2000.c b/drivers/mtd/maps/ixp2000.c
index c00b9175ba9e..1594a802631d 100644
--- a/drivers/mtd/maps/ixp2000.c
+++ b/drivers/mtd/maps/ixp2000.c
@@ -155,7 +155,7 @@ static int ixp2000_flash_probe(struct platform_device *dev)
         if (!plat)
                 return -ENODEV;
 
-        window_size = dev->resource->end - dev->resource->start + 1;
+        window_size = resource_size(dev->resource);
         dev_info(&dev->dev, "Probe of IXP2000 flash(%d banks x %dMiB)\n",
                  ixp_data->nr_banks, ((u32)window_size >> 20));
 
@@ -194,16 +194,17 @@ static int ixp2000_flash_probe(struct platform_device *dev)
         info->map.copy_to = ixp2000_flash_copy_to;
 
         info->res = request_mem_region(dev->resource->start,
-                        dev->resource->end - dev->resource->start + 1,
-                        dev_name(&dev->dev));
+                                       resource_size(dev->resource),
+                                       dev_name(&dev->dev));
         if (!info->res) {
                 dev_err(&dev->dev, "Could not reserve memory region\n");
                 err = -ENOMEM;
                 goto Error;
         }
 
-        info->map.map_priv_1 = (unsigned long) ioremap(dev->resource->start,
-                                dev->resource->end - dev->resource->start + 1);
+        info->map.map_priv_1 =
+                (unsigned long)ioremap(dev->resource->start,
+                                       resource_size(dev->resource));
         if (!info->map.map_priv_1) {
                 dev_err(&dev->dev, "Failed to ioremap flash region\n");
                 err = -EIO;
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c
index f59d62f74d44..7ae137d4b998 100644
--- a/drivers/mtd/maps/pxa2xx-flash.c
+++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -70,7 +70,7 @@ static int __devinit pxa2xx_flash_probe(struct platform_device *pdev)
         info->map.name = (char *) flash->name;
         info->map.bankwidth = flash->width;
         info->map.phys = res->start;
-        info->map.size = res->end - res->start + 1;
+        info->map.size = resource_size(res);
         info->parts = flash->parts;
         info->nr_parts = flash->nr_parts;
 
diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index b300705d41cb..d4ba1f218e9a 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -513,7 +513,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
 
         host->io_phys = (dma_addr_t)mem->start;
 
-        host->io_base = ioremap(mem->start, mem->end - mem->start + 1);
+        host->io_base = ioremap(mem->start, resource_size(mem));
         if (host->io_base == NULL) {
                 printk(KERN_ERR "atmel_nand: ioremap failed\n");
                 res = -EIO;
@@ -547,7 +547,7 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
         if (no_ecc)
                 nand_chip->ecc.mode = NAND_ECC_NONE;
         if (hard_ecc && regs) {
-                host->ecc = ioremap(regs->start, regs->end - regs->start + 1);
+                host->ecc = ioremap(regs->start, resource_size(regs));
                 if (host->ecc == NULL) {
                         printk(KERN_ERR "atmel_nand: ioremap failed\n");
                         res = -EIO;
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c
index 9ec280738a9a..8c569e454dc5 100644
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
@@ -380,7 +380,7 @@ static int __devinit bcm_umi_nand_probe(struct platform_device *pdev)
                 return -ENXIO;
 
         /* map physical address */
-        bcm_umi_io_base = ioremap(r->start, r->end - r->start + 1);
+        bcm_umi_io_base = ioremap(r->start, resource_size(r));
 
         if (!bcm_umi_io_base) {
                 printk(KERN_ERR "ioremap to access BCM UMI NAND chip failed\n");
diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c
index 2f7c930872f9..eb1fbac63eb6 100644
--- a/drivers/mtd/nand/mpc5121_nfc.c
+++ b/drivers/mtd/nand/mpc5121_nfc.c
@@ -713,7 +713,7 @@ static int __devinit mpc5121_nfc_probe(struct platform_device *op)
         }
 
         regs_paddr = res.start;
-        regs_size = res.end - res.start + 1;
+        regs_size = resource_size(&res);
 
         if (!devm_request_mem_region(dev, regs_paddr, regs_size, DRV_NAME)) {
                 dev_err(dev, "Error requesting memory region!\n");