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>

2 files changed, 8 insertions, 10 deletions

diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 1c9c80a1a86a..6ffccd6e0156 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -228,7 +228,7 @@ _sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz)
         }
 
         pa &= PAGE_MASK;
-        sparc_mapiorange(bus, pa, res->start, res->end - res->start + 1);
+        sparc_mapiorange(bus, pa, res->start, resource_size(res));
 
         return (void __iomem *)(unsigned long)(res->start + offset);
 }
@@ -240,7 +240,7 @@ static void _sparc_free_io(struct resource *res)
 {
         unsigned long plen;
 
-        plen = res->end - res->start + 1;
+        plen = resource_size(res);
         BUG_ON((plen & (PAGE_SIZE-1)) != 0);
         sparc_unmapiorange(res->start, plen);
         release_resource(res);
@@ -331,9 +331,9 @@ static void sbus_free_coherent(struct device *dev, size_t n, void *p,
         }
 
         n = PAGE_ALIGN(n);
-        if ((res->end-res->start)+1 != n) {
+        if (resource_size(res) != n) {
                 printk("sbus_free_consistent: region 0x%lx asked 0x%zx\n",
-                    (long)((res->end-res->start)+1), n);
+                    (long)resource_size(res), n);
                 return;
         }
 
@@ -504,9 +504,9 @@ static void pci32_free_coherent(struct device *dev, size_t n, void *p,
         }
 
         n = PAGE_ALIGN(n);
-        if ((res->end-res->start)+1 != n) {
+        if (resource_size(res) != n) {
                 printk("pci_free_consistent: region 0x%lx asked 0x%lx\n",
-                    (long)((res->end-res->start)+1), (long)n);
+                    (long)resource_size(res), (long)n);
                 return;
         }
 
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 713dc91020a6..2d1453dd93d5 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -820,11 +820,9 @@ static int __pci_mmap_make_offset_bus(struct pci_dev *pdev, struct vm_area_struc
         unsigned long space_size, user_offset, user_size;
 
         if (mmap_state == pci_mmap_io) {
-                space_size = (pbm->io_space.end -
-                              pbm->io_space.start) + 1;
+                space_size = resource_size(&pbm->io_space);
         } else {
-                space_size = (pbm->mem_space.end -
-                              pbm->mem_space.start) + 1;
+                space_size = resource_size(&pbm->mem_space);
         }
 
         /* Make sure the request is in range. */