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, 4 insertions, 3 deletions

diff --git a/arch/sparc64/kernel/iommu.c b/arch/sparc64/kernel/iommu.c
index f73b238cd2d4..1cc1995531e2 100644
--- a/arch/sparc64/kernel/iommu.c
+++ b/arch/sparc64/kernel/iommu.c
@@ -575,7 +575,7 @@ static int dma_4u_map_sg(struct device *dev, struct scatterlist *sglist,
                 }
                 /* Allocate iommu entries for that segment */
                 paddr = (unsigned long) SG_ENT_PHYS_ADDRESS(s);
-                npages = iommu_nr_pages(paddr, slen);
+                npages = iommu_num_pages(paddr, slen, IO_PAGE_SIZE);
                 entry = iommu_range_alloc(dev, iommu, npages, &handle);
 
                 /* Handle failure */
@@ -647,7 +647,8 @@ iommu_map_failed:
                         iopte_t *base;
 
                         vaddr = s->dma_address & IO_PAGE_MASK;
-                        npages = iommu_nr_pages(s->dma_address, s->dma_length);
+                        npages = iommu_num_pages(s->dma_address, s->dma_length,
+                                                 IO_PAGE_SIZE);
                         iommu_range_free(iommu, vaddr, npages);
 
                         entry = (vaddr - iommu->page_table_map_base)
@@ -715,7 +716,7 @@ static void dma_4u_unmap_sg(struct device *dev, struct scatterlist *sglist,
 
                 if (!len)
                         break;
-                npages = iommu_nr_pages(dma_handle, len);
+                npages = iommu_num_pages(dma_handle, len, IO_PAGE_SIZE);
                 iommu_range_free(iommu, dma_handle, npages);
 
                 entry = ((dma_handle - iommu->page_table_map_base)