sparc/iommu: merge iommu_get_one and __sbus_iommu_map_page

There is only one caller of iommu_get_one left, so merge it into
that one to clean things up a bit.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 8fbc08d148361fcdf6ce65ec8ea3978a96129fef..71ac353032b686e9fe0cc252613c8d6c97c2cfca 100644 (file)
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -175,43 +175,17 @@ static void iommu_flush_iotlb(iopte_t *iopte, unsigned int niopte)
        }
 }
 
-static u32 iommu_get_one(struct device *dev, phys_addr_t paddr, int npages)
-{
-       struct iommu_struct *iommu = dev->archdata.iommu;
-       int ioptex;
-       iopte_t *iopte, *iopte0;
-       unsigned int busa, busa0;
-       unsigned long pfn = __phys_to_pfn(paddr);
-       int i;
-
-       /* page color = pfn of page */
-       ioptex = bit_map_string_get(&iommu->usemap, npages, pfn);
-       if (ioptex < 0)
-               panic("iommu out");
-       busa0 = iommu->start + (ioptex << PAGE_SHIFT);
-       iopte0 = &iommu->page_table[ioptex];
-
-       busa = busa0;
-       iopte = iopte0;
-       for (i = 0; i < npages; i++) {
-               iopte_val(*iopte) = MKIOPTE(pfn, IOPERM);
-               iommu_invalidate_page(iommu->regs, busa);
-               busa += PAGE_SIZE;
-               iopte++;
-               pfn++;
-       }
-
-       iommu_flush_iotlb(iopte0, npages);
-
-       return busa0;
-}
-
 static dma_addr_t __sbus_iommu_map_page(struct device *dev, struct page *page,
                unsigned long offset, size_t len, bool per_page_flush)
 {
+       struct iommu_struct *iommu = dev->archdata.iommu;
        phys_addr_t paddr = page_to_phys(page) + offset;
        unsigned long off = paddr & ~PAGE_MASK;
        unsigned long npages = (off + len + PAGE_SIZE - 1) >> PAGE_SHIFT;
+       unsigned long pfn = __phys_to_pfn(paddr);
+       unsigned int busa, busa0;
+       iopte_t *iopte, *iopte0;
+       int ioptex, i;
 
        /* XXX So what is maxphys for us and how do drivers know it? */
        if (!len || len > 256 * 1024)
@@ -230,7 +204,25 @@ static dma_addr_t __sbus_iommu_map_page(struct device *dev, struct page *page,
                        flush_page_for_dma(p);
        }
 
-       return iommu_get_one(dev, paddr, npages) + off;
+       /* page color = pfn of page */
+       ioptex = bit_map_string_get(&iommu->usemap, npages, pfn);
+       if (ioptex < 0)
+               panic("iommu out");
+       busa0 = iommu->start + (ioptex << PAGE_SHIFT);
+       iopte0 = &iommu->page_table[ioptex];
+
+       busa = busa0;
+       iopte = iopte0;
+       for (i = 0; i < npages; i++) {
+               iopte_val(*iopte) = MKIOPTE(pfn, IOPERM);
+               iommu_invalidate_page(iommu->regs, busa);
+               busa += PAGE_SIZE;
+               iopte++;
+               pfn++;
+       }
+
+       iommu_flush_iotlb(iopte0, npages);
+       return busa0 + off;
 }
 
 static dma_addr_t sbus_iommu_map_page_gflush(struct device *dev,