sparc64: use iommu_num_pages function in IOMMU code

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 12 deletions

diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h
index 202d8ae2a67e..591f5879039c 100644
--- a/arch/sparc64/kernel/iommu_common.h
+++ b/arch/sparc64/kernel/iommu_common.h
@@ -35,17 +35,6 @@
 
 #define SG_ENT_PHYS_ADDRESS(SG) (__pa(sg_virt((SG))))
 
-static inline unsigned long iommu_nr_pages(unsigned long vaddr,
-                                            unsigned long slen)
-{
-        unsigned long npages;
-
-        npages = IO_PAGE_ALIGN(vaddr + slen) - (vaddr & IO_PAGE_MASK);
-        npages >>= IO_PAGE_SHIFT;
-
-        return npages;
-}
-
 static inline int is_span_boundary(unsigned long entry,
                                    unsigned long shift,
                                    unsigned long boundary_size,
@@ -53,7 +42,8 @@ static inline int is_span_boundary(unsigned long entry,
                                    struct scatterlist *sg)
 {
         unsigned long paddr = SG_ENT_PHYS_ADDRESS(outs);
-        int nr = iommu_nr_pages(paddr, outs->dma_length + sg->length);
+        int nr = iommu_num_pages(paddr, outs->dma_length + sg->length,
+                                 IO_PAGE_SIZE);
 
         return iommu_is_span_boundary(entry, nr, shift, boundary_size);
 }