3 files changed, 9 insertions, 11 deletions

diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
index e67880381b84..cfa9cd2e5519 100644
--- a/arch/sparc/include/asm/elf_64.h
+++ b/arch/sparc/include/asm/elf_64.h
@@ -186,7 +186,7 @@ static inline unsigned int sparc64_elf_hwcap(void)
         return cap;
 }
 
-#define ELF_HWCAP       sparc64_elf_hwcap();
+#define ELF_HWCAP       sparc64_elf_hwcap()
 
 /* This yields a string that ld.so will use to load implementation
    specific libraries for optimization.  This is more specific in
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 80a87e2a3e7c..1e94f946570e 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. */