sparc32: Convert mmu_* interfaces from btfixup to method ops.

This set of changes displays one major danger of btfixup, interface
signatures are not always type checked fully.  As seen here the iounit
variant of the map_dma_area routine had an incorrect type for one of
it's arguments.

It turns out to be harmless in this case, but just imagine trying to
debug something involving this kind of problem.  No thanks.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 49 insertions, 23 deletions

diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index d175c0ae5e4d..eb99862e9654 100644
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -197,7 +197,7 @@ static void iounit_release_scsi_sgl(struct device *dev, struct scatterlist *sg,
 }
 
 #ifdef CONFIG_SBUS
-static int iounit_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va, __u32 addr, int len)
+static int iounit_map_dma_area(struct device *dev, dma_addr_t *pba, unsigned long va, unsigned long addr, int len)
 {
         struct iounit_struct *iounit = dev->archdata.iommu;
         unsigned long page, end;
@@ -242,15 +242,18 @@ static void iounit_unmap_dma_area(struct device *dev, unsigned long addr, int le
 }
 #endif
 
-void __init ld_mmu_iounit(void)
-{
-        BTFIXUPSET_CALL(mmu_get_scsi_one, iounit_get_scsi_one, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_get_scsi_sgl, iounit_get_scsi_sgl, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_release_scsi_one, iounit_release_scsi_one, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_release_scsi_sgl, iounit_release_scsi_sgl, BTFIXUPCALL_NORM);
-
+static const struct sparc32_dma_ops iounit_dma_ops = {
+        .get_scsi_one           = iounit_get_scsi_one,
+        .get_scsi_sgl           = iounit_get_scsi_sgl,
+        .release_scsi_one       = iounit_release_scsi_one,
+        .release_scsi_sgl       = iounit_release_scsi_sgl,
 #ifdef CONFIG_SBUS
-        BTFIXUPSET_CALL(mmu_map_dma_area, iounit_map_dma_area, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_unmap_dma_area, iounit_unmap_dma_area, BTFIXUPCALL_NORM);
+        .map_dma_area           = iounit_map_dma_area,
+        .unmap_dma_area         = iounit_unmap_dma_area,
 #endif
+};
+
+void __init ld_mmu_iounit(void)
+{
+        sparc32_dma_ops = &iounit_dma_ops;
 }
diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c
index 349ba83f1789..c64f81e370aa 100644
--- a/arch/sparc/mm/iommu.c
+++ b/arch/sparc/mm/iommu.c
@@ -426,29 +426,52 @@ static void iommu_unmap_dma_area(struct device *dev, unsigned long busa, int len
 }
 #endif
 
+static const struct sparc32_dma_ops iommu_dma_noflush_ops = {
+        .get_scsi_one           = iommu_get_scsi_one_noflush,
+        .get_scsi_sgl           = iommu_get_scsi_sgl_noflush,
+        .release_scsi_one       = iommu_release_scsi_one,
+        .release_scsi_sgl       = iommu_release_scsi_sgl,
+#ifdef CONFIG_SBUS
+        .map_dma_area           = iommu_map_dma_area,
+        .unmap_dma_area         = iommu_unmap_dma_area,
+#endif
+};
+
+static const struct sparc32_dma_ops iommu_dma_gflush_ops = {
+        .get_scsi_one           = iommu_get_scsi_one_gflush,
+        .get_scsi_sgl           = iommu_get_scsi_sgl_gflush,
+        .release_scsi_one       = iommu_release_scsi_one,
+        .release_scsi_sgl       = iommu_release_scsi_sgl,
+#ifdef CONFIG_SBUS
+        .map_dma_area           = iommu_map_dma_area,
+        .unmap_dma_area         = iommu_unmap_dma_area,
+#endif
+};
+
+static const struct sparc32_dma_ops iommu_dma_pflush_ops = {
+        .get_scsi_one           = iommu_get_scsi_one_pflush,
+        .get_scsi_sgl           = iommu_get_scsi_sgl_pflush,
+        .release_scsi_one       = iommu_release_scsi_one,
+        .release_scsi_sgl       = iommu_release_scsi_sgl,
+#ifdef CONFIG_SBUS
+        .map_dma_area           = iommu_map_dma_area,
+        .unmap_dma_area         = iommu_unmap_dma_area,
+#endif
+};
+
 void __init ld_mmu_iommu(void)
 {
         viking_flush = (BTFIXUPVAL_CALL(flush_page_for_dma) == (unsigned long)viking_flush_page);
 
         if (!BTFIXUPVAL_CALL(flush_page_for_dma)) {
                 /* IO coherent chip */
-                BTFIXUPSET_CALL(mmu_get_scsi_one, iommu_get_scsi_one_noflush, BTFIXUPCALL_RETO0);
-                BTFIXUPSET_CALL(mmu_get_scsi_sgl, iommu_get_scsi_sgl_noflush, BTFIXUPCALL_NORM);
+                sparc32_dma_ops = &iommu_dma_noflush_ops;
         } else if (flush_page_for_dma_global) {
                 /* flush_page_for_dma flushes everything, no matter of what page is it */
-                BTFIXUPSET_CALL(mmu_get_scsi_one, iommu_get_scsi_one_gflush, BTFIXUPCALL_NORM);
-                BTFIXUPSET_CALL(mmu_get_scsi_sgl, iommu_get_scsi_sgl_gflush, BTFIXUPCALL_NORM);
+                sparc32_dma_ops = &iommu_dma_gflush_ops;
         } else {
-                BTFIXUPSET_CALL(mmu_get_scsi_one, iommu_get_scsi_one_pflush, BTFIXUPCALL_NORM);
-                BTFIXUPSET_CALL(mmu_get_scsi_sgl, iommu_get_scsi_sgl_pflush, BTFIXUPCALL_NORM);
+                sparc32_dma_ops = &iommu_dma_pflush_ops;
         }
-        BTFIXUPSET_CALL(mmu_release_scsi_one, iommu_release_scsi_one, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_release_scsi_sgl, iommu_release_scsi_sgl, BTFIXUPCALL_NORM);
-
-#ifdef CONFIG_SBUS
-        BTFIXUPSET_CALL(mmu_map_dma_area, iommu_map_dma_area, BTFIXUPCALL_NORM);
-        BTFIXUPSET_CALL(mmu_unmap_dma_area, iommu_unmap_dma_area, BTFIXUPCALL_NORM);
-#endif
 
         if (viking_mxcc_present || srmmu_modtype == HyperSparc) {
                 dvma_prot = __pgprot(SRMMU_CACHE | SRMMU_ET_PTE | SRMMU_PRIV);