13 files changed, 22 insertions, 21 deletions

diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c
index f1573d492e90..85045cde3126 100644
--- a/drivers/net/bcm63xx_enet.c
+++ b/drivers/net/bcm63xx_enet.c
@@ -1646,7 +1646,7 @@ static int __devinit bcm_enet_probe(struct platform_device *pdev)
         if (ret)
                 goto out;
 
-        iomem_size = res_mem->end - res_mem->start + 1;
+        iomem_size = resource_size(res_mem);
         if (!request_mem_region(res_mem->start, iomem_size, "bcm63xx_enet")) {
                 ret = -EBUSY;
                 goto out;
@@ -1861,7 +1861,7 @@ static int __devexit bcm_enet_remove(struct platform_device *pdev)
         /* release device resources */
         iounmap(priv->base);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
 
         /* disable hw block clocks */
         if (priv->phy_clk) {
@@ -1897,7 +1897,7 @@ static int __devinit bcm_enet_shared_probe(struct platform_device *pdev)
         if (!res)
                 return -ENODEV;
 
-        iomem_size = res->end - res->start + 1;
+        iomem_size = resource_size(res);
         if (!request_mem_region(res->start, iomem_size, "bcm63xx_enet_dma"))
                 return -EBUSY;
 
@@ -1915,7 +1915,7 @@ static int __devexit bcm_enet_shared_remove(struct platform_device *pdev)
 
         iounmap(bcm_enet_shared_base);
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
         return 0;
 }
 
diff --git a/drivers/net/can/softing/softing_main.c b/drivers/net/can/softing/softing_main.c
index 60a49e5a2a53..f76e88e74285 100644
--- a/drivers/net/can/softing/softing_main.c
+++ b/drivers/net/can/softing/softing_main.c
@@ -799,7 +799,7 @@ static __devinit int softing_pdev_probe(struct platform_device *pdev)
         if (!pres)
                 goto platform_resource_failed;
         card->dpram_phys = pres->start;
-        card->dpram_size = pres->end - pres->start + 1;
+        card->dpram_size = resource_size(pres);
         card->dpram = ioremap_nocache(card->dpram_phys, card->dpram_size);
         if (!card->dpram) {
                 dev_alert(&card->pdev->dev, "dpram ioremap failed\n");
diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index dcc4a170b0f3..c35ba5fba8f6 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -1821,7 +1821,7 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         }
 
         priv->emac_base_phys = res->start + pdata->ctrl_reg_offset;
-        size = res->end - res->start + 1;
+        size = resource_size(res);
         if (!request_mem_region(res->start, size, ndev->name)) {
                 dev_err(&pdev->dev, "failed request_mem_region() for regs\n");
                 rc = -ENXIO;
@@ -1926,7 +1926,7 @@ no_irq_res:
         cpdma_ctlr_destroy(priv->dma);
 no_dma:
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
         iounmap(priv->remap_addr);
 
 probe_quit:
@@ -1960,7 +1960,7 @@ static int __devexit davinci_emac_remove(struct platform_device *pdev)
                 cpdma_chan_destroy(priv->rxchan);
         cpdma_ctlr_destroy(priv->dma);
 
-        release_mem_region(res->start, res->end - res->start + 1);
+        release_mem_region(res->start, resource_size(res));
 
         unregister_netdev(ndev);
         iounmap(priv->remap_addr);
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index a83dd312c3ac..15e4a71fbf1e 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -965,7 +965,7 @@ static int __devinit ethoc_probe(struct platform_device *pdev)
         priv = netdev_priv(netdev);
         priv->netdev = netdev;
         priv->dma_alloc = 0;
-        priv->io_region_size = mmio->end - mmio->start + 1;
+        priv->io_region_size = resource_size(mmio);
 
         priv->iobase = devm_ioremap_nocache(&pdev->dev, netdev->base_addr,
                         resource_size(mmio));
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 9f81b1ac130e..fe57eee8a679 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -867,10 +867,11 @@ static int __devinit mpc52xx_fec_probe(struct platform_device *op)
                                 "Error while parsing device node resource\n" );
                 goto err_netdev;
         }
-        if ((mem.end - mem.start + 1) < sizeof(struct mpc52xx_fec)) {
+        if (resource_size(&mem) < sizeof(struct mpc52xx_fec)) {
                 printk(KERN_ERR DRIVER_NAME
-                        " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
-                        (unsigned long)(mem.end - mem.start + 1), sizeof(struct mpc52xx_fec));
+                       " - invalid resource size (%lx < %x), check mpc52xx_devices.c\n",
+                       (unsigned long)resource_size(&mem),
+                       sizeof(struct mpc52xx_fec));
                 rv = -EINVAL;
                 goto err_netdev;
         }
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index ad2975440719..b09270b5d0a5 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -120,7 +120,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
         if (ret)
                 return ret;
 
-        if (res.end - res.start < 13)
+        if (resource_size(&res) <= 13)
                 return -ENODEV;
 
         /* This should really encode the pin number as well, but all
@@ -139,7 +139,7 @@ static int __devinit fs_mii_bitbang_init(struct mii_bus *bus,
                 return -ENODEV;
         mdc_pin = *data;
 
-        bitbang->dir = ioremap(res.start, res.end - res.start + 1);
+        bitbang->dir = ioremap(res.start, resource_size(&res));
         if (!bitbang->dir)
                 return -ENOMEM;
 
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 6a2e150e75bb..e0e9d6c35d83 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -136,7 +136,7 @@ static int __devinit fs_enet_mdio_probe(struct platform_device *ofdev)
 
         snprintf(new_bus->id, MII_BUS_ID_SIZE, "%x", res.start);
 
-        fec->fecp = ioremap(res.start, res.end - res.start + 1);
+        fec->fecp = ioremap(res.start, resource_size(&res));
         if (!fec->fecp)
                 goto out_fec;
 
diff --git a/drivers/net/gianfar_ptp.c b/drivers/net/gianfar_ptp.c
index d8e175382d1d..1c97861596f0 100644
--- a/drivers/net/gianfar_ptp.c
+++ b/drivers/net/gianfar_ptp.c
@@ -491,7 +491,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
         spin_lock_init(&etsects->lock);
 
         etsects->regs = ioremap(etsects->rsrc->start,
-                                1 + etsects->rsrc->end - etsects->rsrc->start);
+                                resource_size(etsects->rsrc));
         if (!etsects->regs) {
                 pr_err("ioremap ptp registers failed\n");
                 goto no_ioremap;
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 079450fe5e96..725399ea0690 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -2770,7 +2770,7 @@ static int __devinit emac_probe(struct platform_device *ofdev)
         }
         // TODO : request_mem_region
         dev->emacp = ioremap(dev->rsrc_regs.start,
-                             dev->rsrc_regs.end - dev->rsrc_regs.start + 1);
+                             resource_size(&dev->rsrc_regs));
         if (dev->emacp == NULL) {
                 printk(KERN_ERR "%s: Can't map device registers!\n",
                        np->full_name);
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 6c6a02869dfc..27125cdd7e01 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1169,7 +1169,7 @@ static int __init macb_probe(struct platform_device *pdev)
         clk_enable(bp->hclk);
 #endif
 
-        bp->regs = ioremap(regs->start, regs->end - regs->start + 1);
+        bp->regs = ioremap(regs->start, resource_size(regs));
         if (!bp->regs) {
                 dev_err(&pdev->dev, "failed to map registers, aborting.\n");
                 err = -ENOMEM;
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a5d9b1c310b3..b75648257381 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2593,7 +2593,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
         if (msp == NULL)
                 goto out;
 
-        msp->base = ioremap(res->start, res->end - res->start + 1);
+        msp->base = ioremap(res->start, resource_size(res));
         if (msp->base == NULL)
                 goto out_free;
 
diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index 89f7540d90f9..df1292eb9c2e 100644
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -1502,7 +1502,7 @@ static int pxa168_eth_probe(struct platform_device *pdev)
                 err = -ENODEV;
                 goto err_netdev;
         }
-        pep->base = ioremap(res->start, res->end - res->start + 1);
+        pep->base = ioremap(res->start, resource_size(res));
         if (pep->base == NULL) {
                 err = -ENOMEM;
                 goto err_netdev;
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 68d50429ddf3..ea65f7ec360a 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2597,7 +2597,7 @@ static int __devinit sbmac_probe(struct platform_device *pldev)
 
         res = platform_get_resource(pldev, IORESOURCE_MEM, 0);
         BUG_ON(!res);
-        sbm_base = ioremap_nocache(res->start, res->end - res->start + 1);
+        sbm_base = ioremap_nocache(res->start, resource_size(res));
         if (!sbm_base) {
                 printk(KERN_ERR "%s: unable to map device registers\n",
                        dev_name(&pldev->dev));