23 files changed, 34 insertions, 35 deletions

diff --git a/drivers/usb/host/ehci-ath79.c b/drivers/usb/host/ehci-ath79.c
index 98cc8a13169c..eab3d7059fbe 100644
--- a/drivers/usb/host/ehci-ath79.c
+++ b/drivers/usb/host/ehci-ath79.c
@@ -146,7 +146,7 @@ static int ehci_ath79_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len   = res->end - res->start + 1;
+        hcd->rsrc_len   = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ehci-cns3xxx.c b/drivers/usb/host/ehci-cns3xxx.c
index d41745c6f0c4..6536abdea6e6 100644
--- a/drivers/usb/host/ehci-cns3xxx.c
+++ b/drivers/usb/host/ehci-cns3xxx.c
@@ -107,7 +107,7 @@ static int cns3xxx_ehci_probe(struct platform_device *pdev)
         }
 
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 driver->description)) {
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c
index f380bf97e5af..34a3140d1e5f 100644
--- a/drivers/usb/host/ehci-fsl.c
+++ b/drivers/usb/host/ehci-fsl.c
@@ -100,7 +100,7 @@ static int usb_hcd_fsl_probe(const struct hc_driver *driver,
                 goto err2;
         }
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 driver->description)) {
                 dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ehci-grlib.c b/drivers/usb/host/ehci-grlib.c
index 93b230dc51a2..fdfd8c5b639b 100644
--- a/drivers/usb/host/ehci-grlib.c
+++ b/drivers/usb/host/ehci-grlib.c
@@ -130,7 +130,7 @@ static int __devinit ehci_hcd_grlib_probe(struct platform_device *op)
                 return -ENOMEM;
 
         hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ehci-ixp4xx.c b/drivers/usb/host/ehci-ixp4xx.c
index 50e600d26e28..c4460f3d009f 100644
--- a/drivers/usb/host/ehci-ixp4xx.c
+++ b/drivers/usb/host/ehci-ixp4xx.c
@@ -100,7 +100,7 @@ static int ixp4xx_ehci_probe(struct platform_device *pdev)
                 goto fail_request_resource;
         }
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 driver->description)) {
diff --git a/drivers/usb/host/ehci-octeon.c b/drivers/usb/host/ehci-octeon.c
index ff55757ba7d8..c3ba3ed5f3a6 100644
--- a/drivers/usb/host/ehci-octeon.c
+++ b/drivers/usb/host/ehci-octeon.c
@@ -124,7 +124,7 @@ static int ehci_octeon_drv_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         hcd->rsrc_start = res_mem->start;
-        hcd->rsrc_len = res_mem->end - res_mem->start + 1;
+        hcd->rsrc_len = resource_size(res_mem);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 OCTEON_EHCI_HCD_NAME)) {
diff --git a/drivers/usb/host/ehci-pmcmsp.c b/drivers/usb/host/ehci-pmcmsp.c
index cd69099cda19..e8d54de44acc 100644
--- a/drivers/usb/host/ehci-pmcmsp.c
+++ b/drivers/usb/host/ehci-pmcmsp.c
@@ -124,7 +124,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         if (res == NULL)
                 return -ENOMEM;
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
         if (!request_mem_region(res->start, res_len, "mab regs"))
                 return -EBUSY;
 
@@ -140,7 +140,7 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
                 retval = -ENOMEM;
                 goto err2;
         }
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
         if (!request_mem_region(res->start, res_len, "usbid regs")) {
                 retval = -EBUSY;
                 goto err2;
@@ -154,13 +154,13 @@ static int usb_hcd_msp_map_regs(struct mspusb_device *dev)
         return 0;
 err3:
         res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
         release_mem_region(res->start, res_len);
 err2:
         iounmap(dev->mab_regs);
 err1:
         res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-        res_len = res->end - res->start + 1;
+        res_len = resource_size(res);
         release_mem_region(res->start, res_len);
         dev_err(&pdev->dev, "Failed to map non-EHCI regs.\n");
         return retval;
@@ -194,7 +194,7 @@ int usb_hcd_msp_probe(const struct hc_driver *driver,
                 goto err1;
         }
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, dev->name)) {
                 retval = -EBUSY;
                 goto err1;
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 8552db6c29c9..41d11fe14252 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -130,7 +130,7 @@ static int __devinit ehci_hcd_ppc_of_probe(struct platform_device *op)
                 return -ENOMEM;
 
         hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ehci-w90x900.c b/drivers/usb/host/ehci-w90x900.c
index 52a027aaa370..d661cf7de140 100644
--- a/drivers/usb/host/ehci-w90x900.c
+++ b/drivers/usb/host/ehci-w90x900.c
@@ -41,7 +41,7 @@ static int __devinit usb_w90x900_probe(const struct hc_driver *driver,
         }
 
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 retval = -EBUSY;
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index a64d6d66d760..32793ce3d9e9 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -174,7 +174,7 @@ static int __devinit ehci_hcd_xilinx_of_probe(struct platform_device *op)
                 return -ENOMEM;
 
         hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 19223c7449e1..572ea53b0226 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -605,7 +605,7 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev)
                 goto err_regs;
         }
 
-        hcd->regs = ioremap(usb_regs.start, usb_regs.end - usb_regs.start + 1);
+        hcd->regs = ioremap(usb_regs.start, resource_size(&usb_regs));
         if (!hcd->regs) {
                 dev_err(dev, "could not ioremap regs\n");
                 ret = -ENOMEM;
diff --git a/drivers/usb/host/ohci-ath79.c b/drivers/usb/host/ohci-ath79.c
index ffea3e7cb0a8..c620c50f6770 100644
--- a/drivers/usb/host/ohci-ath79.c
+++ b/drivers/usb/host/ohci-ath79.c
@@ -93,8 +93,8 @@ static int ohci_ath79_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto err_put_hcd;
         }
-        hcd->rsrc_start = res->start;
-        hcd->rsrc_len   = res->end - res->start + 1;
+        hcd->rsrc_start = res->start;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dev_dbg(&pdev->dev, "controller already in use\n");
diff --git a/drivers/usb/host/ohci-cns3xxx.c b/drivers/usb/host/ohci-cns3xxx.c
index f05ef87e934c..5a00a1e1c6ca 100644
--- a/drivers/usb/host/ohci-cns3xxx.c
+++ b/drivers/usb/host/ohci-cns3xxx.c
@@ -100,7 +100,7 @@ static int cns3xxx_ohci_probe(struct platform_device *pdev)
                 goto err1;
         }
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                         driver->description)) {
diff --git a/drivers/usb/host/ohci-da8xx.c b/drivers/usb/host/ohci-da8xx.c
index d22fb4d577b7..6aca2c4453f7 100644
--- a/drivers/usb/host/ohci-da8xx.c
+++ b/drivers/usb/host/ohci-da8xx.c
@@ -322,7 +322,7 @@ static int usb_hcd_da8xx_probe(const struct hc_driver *driver,
                 goto err2;
         }
         hcd->rsrc_start = mem->start;
-        hcd->rsrc_len = mem->end - mem->start + 1;
+        hcd->rsrc_len = resource_size(mem);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dev_dbg(&pdev->dev, "request_mem_region failed\n");
diff --git a/drivers/usb/host/ohci-octeon.c b/drivers/usb/host/ohci-octeon.c
index e4ddfaf8870f..d8b45647d1dc 100644
--- a/drivers/usb/host/ohci-octeon.c
+++ b/drivers/usb/host/ohci-octeon.c
@@ -135,7 +135,7 @@ static int ohci_octeon_drv_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         hcd->rsrc_start = res_mem->start;
-        hcd->rsrc_len = res_mem->end - res_mem->start + 1;
+        hcd->rsrc_len = resource_size(res_mem);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len,
                                 OCTEON_OHCI_HCD_NAME)) {
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 1ca1821320f4..0c12f4e14dcd 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -110,7 +110,7 @@ static int __devinit ohci_hcd_ppc_of_probe(struct platform_device *op)
                 return -ENOMEM;
 
         hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ohci-ppc-soc.c b/drivers/usb/host/ohci-ppc-soc.c
index 89e670e38c10..c0f595c44487 100644
--- a/drivers/usb/host/ohci-ppc-soc.c
+++ b/drivers/usb/host/ohci-ppc-soc.c
@@ -56,7 +56,7 @@ static int usb_hcd_ppc_soc_probe(const struct hc_driver *driver,
         if (!hcd)
                 return -ENOMEM;
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 pr_debug("%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/ohci-sa1111.c b/drivers/usb/host/ohci-sa1111.c
index d8eb3bdafabb..4204d9720d23 100644
--- a/drivers/usb/host/ohci-sa1111.c
+++ b/drivers/usb/host/ohci-sa1111.c
@@ -131,7 +131,7 @@ int usb_hcd_sa1111_probe (const struct hc_driver *driver,
         if (!hcd)
                 return -ENOMEM;
         hcd->rsrc_start = dev->res.start;
-        hcd->rsrc_len = dev->res.end - dev->res.start + 1;
+        hcd->rsrc_len = resource_size(&dev->res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 dbg("request_mem_region failed");
diff --git a/drivers/usb/host/ohci-sm501.c b/drivers/usb/host/ohci-sm501.c
index 041d30f30c10..78918ca0da23 100644
--- a/drivers/usb/host/ohci-sm501.c
+++ b/drivers/usb/host/ohci-sm501.c
@@ -103,8 +103,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
                 goto err0;
         }
 
-        if (!request_mem_region(mem->start, mem->end - mem->start + 1,
-                                pdev->name)) {
+        if (!request_mem_region(mem->start, resource_size(mem), pdev->name)) {
                 dev_err(dev, "request_mem_region failed\n");
                 retval = -EBUSY;
                 goto err0;
@@ -126,7 +125,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
 
         if (!dma_declare_coherent_memory(dev, mem->start,
                                          mem->start - mem->parent->start,
-                                         (mem->end - mem->start) + 1,
+                                         resource_size(mem),
                                          DMA_MEMORY_MAP |
                                          DMA_MEMORY_EXCLUSIVE)) {
                 dev_err(dev, "cannot declare coherent memory\n");
@@ -149,7 +148,7 @@ static int ohci_hcd_sm501_drv_probe(struct platform_device *pdev)
         }
 
         hcd->rsrc_start = res->start;
-        hcd->rsrc_len = res->end - res->start + 1;
+        hcd->rsrc_len = resource_size(res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, pdev->name)) {
                 dev_err(dev, "request_mem_region failed\n");
@@ -185,7 +184,7 @@ err3:
 err2:
         dma_release_declared_memory(dev);
 err1:
-        release_mem_region(mem->start, mem->end - mem->start + 1);
+        release_mem_region(mem->start, resource_size(mem));
 err0:
         return retval;
 }
@@ -201,7 +200,7 @@ static int ohci_hcd_sm501_drv_remove(struct platform_device *pdev)
         dma_release_declared_memory(&pdev->dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
         if (mem)
-                release_mem_region(mem->start, mem->end - mem->start + 1);
+                release_mem_region(mem->start, resource_size(mem));
 
         /* mask interrupts and disable power */
 
diff --git a/drivers/usb/host/ohci-tmio.c b/drivers/usb/host/ohci-tmio.c
index 3558491dd87d..57ad1271fc9b 100644
--- a/drivers/usb/host/ohci-tmio.c
+++ b/drivers/usb/host/ohci-tmio.c
@@ -208,13 +208,13 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
         }
 
         hcd->rsrc_start = regs->start;
-        hcd->rsrc_len = regs->end - regs->start + 1;
+        hcd->rsrc_len = resource_size(regs);
 
         tmio = hcd_to_tmio(hcd);
 
         spin_lock_init(&tmio->lock);
 
-        tmio->ccr = ioremap(config->start, config->end - config->start + 1);
+        tmio->ccr = ioremap(config->start, resource_size(config));
         if (!tmio->ccr) {
                 ret = -ENOMEM;
                 goto err_ioremap_ccr;
@@ -228,7 +228,7 @@ static int __devinit ohci_hcd_tmio_drv_probe(struct platform_device *dev)
 
         if (!dma_declare_coherent_memory(&dev->dev, sram->start,
                                 sram->start,
-                                sram->end - sram->start + 1,
+                                resource_size(sram),
                                 DMA_MEMORY_MAP | DMA_MEMORY_EXCLUSIVE)) {
                 ret = -EBUSY;
                 goto err_dma_declare;
diff --git a/drivers/usb/host/oxu210hp-hcd.c b/drivers/usb/host/oxu210hp-hcd.c
index 5fbe997dc6df..dcd889803f0f 100644
--- a/drivers/usb/host/oxu210hp-hcd.c
+++ b/drivers/usb/host/oxu210hp-hcd.c
@@ -3828,7 +3828,7 @@ static int oxu_drv_probe(struct platform_device *pdev)
                 return -ENODEV;
         }
         memstart = res->start;
-        memlen = res->end - res->start + 1;
+        memlen = resource_size(res);
         dev_dbg(&pdev->dev, "MEM resource %lx-%lx\n", memstart, memlen);
         if (!request_mem_region(memstart, memlen,
                                 oxu_hc_driver.description)) {
diff --git a/drivers/usb/host/uhci-grlib.c b/drivers/usb/host/uhci-grlib.c
index d01c1e227681..f7a62138e3e0 100644
--- a/drivers/usb/host/uhci-grlib.c
+++ b/drivers/usb/host/uhci-grlib.c
@@ -111,7 +111,7 @@ static int __devinit uhci_hcd_grlib_probe(struct platform_device *op)
                 return -ENOMEM;
 
         hcd->rsrc_start = res.start;
-        hcd->rsrc_len = res.end - res.start + 1;
+        hcd->rsrc_len = resource_size(&res);
 
         if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) {
                 printk(KERN_ERR "%s: request_mem_region failed\n", __FILE__);
diff --git a/drivers/usb/host/whci/init.c b/drivers/usb/host/whci/init.c
index f7582e8e2169..d3e13b640d4b 100644
--- a/drivers/usb/host/whci/init.c
+++ b/drivers/usb/host/whci/init.c
@@ -178,7 +178,7 @@ void whc_clean_up(struct whc *whc)
         if (whc->qset_pool)
                 dma_pool_destroy(whc->qset_pool);
 
-        len   = whc->umc->resource.end - whc->umc->resource.start + 1;
+        len   = resource_size(&whc->umc->resource);
         if (whc->base)
                 iounmap(whc->base);
         if (whc->base_phys)