treewide: Convert uses of struct resource to resource_size(ptr)

Several fixes as well where the +1 was missing.

Done via coccinelle scripts like:

@@
struct resource *ptr;
@@

- ptr->end - ptr->start + 1
+ resource_size(ptr)

and some grep and typing.

Mostly uncompiled, no cross-compilers.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

7 files changed, 15 insertions, 15 deletions

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index c11af1e4bad3..a07b0e763a80 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -193,7 +193,7 @@ static int __devinit scoop_probe(struct platform_device *pdev)
         spin_lock_init(&devptr->scoop_lock);
 
         inf = pdev->dev.platform_data;
-        devptr->base = ioremap(mem->start, mem->end - mem->start + 1);
+        devptr->base = ioremap(mem->start, resource_size(mem));
 
         if (!devptr->base) {
                 ret = -ENOMEM;
diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 3eb4538fceeb..14dd666850b0 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -525,7 +525,7 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
         if (ARRAY_SIZE(lcdc_resources) > 2) {
                 void __iomem *fb;
                 struct resource *fb_res = &lcdc_resources[2];
-                size_t fb_len = fb_res->end - fb_res->start + 1;
+                size_t fb_len = resource_size(fb_res);
 
                 fb = ioremap(fb_res->start, fb_len);
                 if (fb) {
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index a560439dcc3c..f27c7d2fa9f7 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -129,12 +129,12 @@ static void __init mv78xx0_pcie_preinit(void)
                 struct pcie_port *pp = pcie_port + i;
 
                 mv78xx0_setup_pcie_io_win(win++, pp->res[0].start,
-                        pp->res[0].end - pp->res[0].start + 1,
-                        pp->maj, pp->min);
+                                          resource_size(&pp->res[0]),
+                                          pp->maj, pp->min);
 
                 mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start,
-                        pp->res[1].end - pp->res[1].start + 1,
-                        pp->maj, pp->min);
+                                           resource_size(&pp->res[1]),
+                                           pp->maj, pp->min);
         }
 }
 
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 513d6abec1f5..399c89f14dfb 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1791,7 +1791,7 @@ static void __init u300_assign_physmem(void)
                                      0 == res->start) {
                                 res->start  = curr_start;
                                 res->end   += curr_start;
-                                curr_start += (res->end - res->start + 1);
+                                curr_start += resource_size(res);
 
                                 printk(KERN_INFO "core.c: Mapping RAM " \
                                        "%#x-%#x to device %s:%s\n",
diff --git a/arch/arm/plat-mxc/pwm.c b/arch/arm/plat-mxc/pwm.c
index 7a61ef8f471a..761c3c940a68 100644
--- a/arch/arm/plat-mxc/pwm.c
+++ b/arch/arm/plat-mxc/pwm.c
@@ -214,14 +214,14 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev)
                 goto err_free_clk;
         }
 
-        r = request_mem_region(r->start, r->end - r->start + 1, pdev->name);
+        r = request_mem_region(r->start, resource_size(r), pdev->name);
         if (r == NULL) {
                 dev_err(&pdev->dev, "failed to request memory resource\n");
                 ret = -EBUSY;
                 goto err_free_clk;
         }
 
-        pwm->mmio_base = ioremap(r->start, r->end - r->start + 1);
+        pwm->mmio_base = ioremap(r->start, resource_size(r));
         if (pwm->mmio_base == NULL) {
                 dev_err(&pdev->dev, "failed to ioremap() registers\n");
                 ret = -ENODEV;
@@ -236,7 +236,7 @@ static int __devinit mxc_pwm_probe(struct platform_device *pdev)
         return 0;
 
 err_free_mem:
-        release_mem_region(r->start, r->end - r->start + 1);
+        release_mem_region(r->start, resource_size(r));
 err_free_clk:
         clk_put(pwm->clk);
 err_free:
@@ -260,7 +260,7 @@ static int __devexit mxc_pwm_remove(struct platform_device *pdev)
         iounmap(pwm->mmio_base);
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        release_mem_region(r->start, r->end - r->start + 1);
+        release_mem_region(r->start, resource_size(r));
 
         clk_put(pwm->clk);
 
diff --git a/arch/arm/plat-s5p/sysmmu.c b/arch/arm/plat-s5p/sysmmu.c
index 54f5eddc921d..e1cbc728c775 100644
--- a/arch/arm/plat-s5p/sysmmu.c
+++ b/arch/arm/plat-s5p/sysmmu.c
@@ -232,8 +232,8 @@ static int s5p_sysmmu_probe(struct platform_device *pdev)
                         goto err_res;
                 }
 
-                mem = request_mem_region(res->start,
-                                ((res->end) - (res->start)) + 1, pdev->name);
+                mem = request_mem_region(res->start, resource_size(res),
+                                         pdev->name);
                 if (!mem) {
                         dev_err(dev, "Failed to request the memory region of %s.\n",
                                                         sysmmu_ips_name[i]);
@@ -241,7 +241,7 @@ static int s5p_sysmmu_probe(struct platform_device *pdev)
                         goto err_res;
                 }
 
-                sysmmusfrs[i] = ioremap(res->start, res->end - res->start + 1);
+                sysmmusfrs[i] = ioremap(res->start, resource_size(res));
                 if (!sysmmusfrs[i]) {
                         dev_err(dev, "Failed to ioremap() for %s.\n",
                                                         sysmmu_ips_name[i]);
diff --git a/arch/arm/plat-samsung/pm-check.c b/arch/arm/plat-samsung/pm-check.c
index 6b733fafe7cd..3cbd62666b1e 100644
--- a/arch/arm/plat-samsung/pm-check.c
+++ b/arch/arm/plat-samsung/pm-check.c
@@ -72,7 +72,7 @@ static void s3c_pm_run_sysram(run_fn_t fn, u32 *arg)
 
 static u32 *s3c_pm_countram(struct resource *res, u32 *val)
 {
-        u32 size = (u32)(res->end - res->start)+1;
+        u32 size = (u32)resource_size(res);
 
         size += CHECK_CHUNKSIZE-1;
         size /= CHECK_CHUNKSIZE;