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>

11 files changed, 20 insertions, 22 deletions

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 4484c721f0f9..817ab60f7537 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -906,7 +906,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
         if (map) {
                 /* use a pre-allocated memory buffer */
                 info->fix.smem_start = map->start;
-                info->fix.smem_len = map->end - map->start + 1;
+                info->fix.smem_len = resource_size(map);
                 if (!request_mem_region(info->fix.smem_start,
                                         info->fix.smem_len, pdev->name)) {
                         ret = -EBUSY;
@@ -932,7 +932,7 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
 
         /* LCDC registers */
         info->fix.mmio_start = regs->start;
-        info->fix.mmio_len = regs->end - regs->start + 1;
+        info->fix.mmio_len = resource_size(regs);
 
         if (!request_mem_region(info->fix.mmio_start,
                                 info->fix.mmio_len, pdev->name)) {
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index ebb893c49e90..ad41f508b423 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -3460,9 +3460,10 @@ static int __devinit atyfb_setup_generic(struct pci_dev *pdev,
 
         raddr = addr + 0x7ff000UL;
         rrp = &pdev->resource[2];
-        if ((rrp->flags & IORESOURCE_MEM) && request_mem_region(rrp->start, rrp->end - rrp->start + 1, "atyfb")) {
+        if ((rrp->flags & IORESOURCE_MEM) &&
+            request_mem_region(rrp->start, resource_size(rrp), "atyfb")) {
                 par->aux_start = rrp->start;
-                par->aux_size = rrp->end - rrp->start + 1;
+                par->aux_size = resource_size(rrp);
                 raddr = rrp->start;
                 PRINTKI("using auxiliary register aperture\n");
         }
@@ -3552,7 +3553,7 @@ static int __devinit atyfb_pci_probe(struct pci_dev *pdev,
 
         /* Reserve space */
         res_start = rp->start;
-        res_size = rp->end - rp->start + 1;
+        res_size = resource_size(rp);
         if (!request_mem_region(res_start, res_size, "atyfb"))
                 return -EBUSY;
 
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c
index 34b2fc472fe8..01a8fde67f20 100644
--- a/drivers/video/au1100fb.c
+++ b/drivers/video/au1100fb.c
@@ -486,7 +486,7 @@ static int __devinit au1100fb_drv_probe(struct platform_device *dev)
         }
 
         au1100fb_fix.mmio_start = regs_res->start;
-        au1100fb_fix.mmio_len = regs_res->end - regs_res->start + 1;
+        au1100fb_fix.mmio_len = resource_size(regs_res);
 
         if (!request_mem_region(au1100fb_fix.mmio_start, au1100fb_fix.mmio_len,
                                 DRIVER_NAME)) {
diff --git a/drivers/video/cobalt_lcdfb.c b/drivers/video/cobalt_lcdfb.c
index 42fe155aba0e..e02764319ff7 100644
--- a/drivers/video/cobalt_lcdfb.c
+++ b/drivers/video/cobalt_lcdfb.c
@@ -303,7 +303,7 @@ static int __devinit cobalt_lcdfb_probe(struct platform_device *dev)
                 return -EBUSY;
         }
 
-        info->screen_size = res->end - res->start + 1;
+        info->screen_size = resource_size(res);
         info->screen_base = ioremap(res->start, info->screen_size);
         info->fbops = &cobalt_lcd_fbops;
         info->fix = cobalt_lcdfb_fix;
diff --git a/drivers/video/controlfb.c b/drivers/video/controlfb.c
index c225dcce89e7..9075bea55879 100644
--- a/drivers/video/controlfb.c
+++ b/drivers/video/controlfb.c
@@ -709,11 +709,11 @@ static int __init control_of_init(struct device_node *dp)
 
         /* Map in frame buffer and registers */
         p->fb_orig_base = fb_res.start;
-        p->fb_orig_size = fb_res.end - fb_res.start + 1;
+        p->fb_orig_size = resource_size(&fb_res);
         /* use the big-endian aperture (??) */
         p->frame_buffer_phys = fb_res.start + 0x800000;
         p->control_regs_phys = reg_res.start;
-        p->control_regs_size = reg_res.end - reg_res.start + 1;
+        p->control_regs_size = resource_size(&reg_res);
 
         if (!p->fb_orig_base ||
             !request_mem_region(p->fb_orig_base,p->fb_orig_size,"controlfb")) {
diff --git a/drivers/video/mb862xx/mb862xxfbdrv.c b/drivers/video/mb862xx/mb862xxfbdrv.c
index f70bd63b0187..ee1de3e26dec 100644
--- a/drivers/video/mb862xx/mb862xxfbdrv.c
+++ b/drivers/video/mb862xx/mb862xxfbdrv.c
@@ -697,7 +697,7 @@ static int __devinit of_platform_mb862xx_probe(struct platform_device *ofdev)
                 goto fbrel;
         }
 
-        res_size = 1 + res.end - res.start;
+        res_size = resource_size(&res);
         par->res = request_mem_region(res.start, res_size, DRV_NAME);
         if (par->res == NULL) {
                 dev_err(dev, "Cannot claim framebuffer/mmio\n");
@@ -787,7 +787,7 @@ static int __devexit of_platform_mb862xx_remove(struct platform_device *ofdev)
 {
         struct fb_info *fbi = dev_get_drvdata(&ofdev->dev);
         struct mb862xxfb_par *par = fbi->par;
-        resource_size_t res_size = 1 + par->res->end - par->res->start;
+        resource_size_t res_size = resource_size(par->res);
         unsigned long reg;
 
         dev_dbg(fbi->dev, "%s release\n", fbi->fix.id);
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index c3636d55a3c5..243d16f09b8a 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -406,8 +406,7 @@ int mdp_probe(struct platform_device *pdev)
                 goto error_get_irq;
         }
 
-        mdp->base = ioremap(resource->start,
-                            resource->end - resource->start);
+        mdp->base = ioremap(resource->start, resource_size(resource));
         if (mdp->base == 0) {
                 printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n");
                 ret = -ENOMEM;
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c
index ec351309e607..c6e3b4fcdd68 100644
--- a/drivers/video/msm/msm_fb.c
+++ b/drivers/video/msm/msm_fb.c
@@ -525,10 +525,9 @@ static int setup_fbmem(struct msmfb_info *msmfb, struct platform_device *pdev)
                 return -ENOMEM;
         }
         fb->fix.smem_start = resource->start;
-        fb->fix.smem_len = resource->end - resource->start;
-        fbram = ioremap(resource->start,
-                        resource->end - resource->start);
-        if (fbram == 0) {
+        fb->fix.smem_len = resource_size(resource);
+        fbram = ioremap(resource->start, resource_size(resource));
+        if (fbram == NULL) {
                 printk(KERN_ERR "msmfb: cannot allocate fbram!\n");
                 return -ENOMEM;
         }
diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index f838d9e277f0..0fff59782e45 100644
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -551,7 +551,7 @@ static int __devinit nuc900fb_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-        size = (res->end - res->start) + 1;
+        size = resource_size(res);
         fbi->mem = request_mem_region(res->start, size, pdev->name);
         if (fbi->mem == NULL) {
                 dev_err(&pdev->dev, "failed to alloc memory region\n");
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index ef532d9d3c99..f27ae16ead2e 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -567,7 +567,7 @@ static int __devinit platinumfb_probe(struct platform_device* odev)
          * northbridge and that can fail. Only request framebuffer
          */
         if (!request_mem_region(pinfo->rsrc_fb.start,
-                                pinfo->rsrc_fb.end - pinfo->rsrc_fb.start + 1,
+                                resource_size(&pinfo->rsrc_fb),
                                 "platinumfb framebuffer")) {
                 printk(KERN_ERR "platinumfb: Can't request framebuffer !\n");
                 framebuffer_release(info);
@@ -658,8 +658,7 @@ static int __devexit platinumfb_remove(struct platform_device* odev)
         iounmap(pinfo->cmap_regs);
 
         release_mem_region(pinfo->rsrc_fb.start,
-                           pinfo->rsrc_fb.end -
-                           pinfo->rsrc_fb.start + 1);
+                           resource_size(&pinfo->rsrc_fb));
 
         release_mem_region(pinfo->cmap_regs_phys, 0x1000);
 
diff --git a/drivers/video/pxa168fb.c b/drivers/video/pxa168fb.c
index bb95ec56d25d..18ead6f0184d 100644
--- a/drivers/video/pxa168fb.c
+++ b/drivers/video/pxa168fb.c
@@ -662,7 +662,7 @@ static int __devinit pxa168fb_probe(struct platform_device *pdev)
         info->fix.ypanstep = 0;
         info->fix.ywrapstep = 0;
         info->fix.mmio_start = res->start;
-        info->fix.mmio_len = res->end - res->start + 1;
+        info->fix.mmio_len = resource_size(res);
         info->fix.accel = FB_ACCEL_NONE;
         info->fbops = &pxa168fb_ops;
         info->pseudo_palette = fbi->pseudo_palette;