[PATCH] ARM/dma-mapping: Disambiguate ops from iommu_ops in IOMMU core

[PATCH] ARM/dma-mapping: Disambiguate ops from iommu_ops in IOMMU core

[Easwar Hariharan]

The architecture dma ops collides with the struct iommu_ops {} defined in
/include/linux/iommu.h. This isn't a major issue, just a nagging annoyance.

Rename iommu_ops to arm_dma_iommu_ops to disambiguate and better match the
other architectures. No functional changes intended.

Signed-off-by: Easwar Hariharan <eahariha@linux.microsoft.com>
---
 arch/arm/mm/dma-mapping.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 88c2d68a69c9e..51b5319e8f519 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -1510,7 +1510,7 @@ static void arm_iommu_sync_single_for_device(struct device *dev,
 	__dma_page_cpu_to_dev(page, offset, size, dir);
 }
 
-static const struct dma_map_ops iommu_ops = {
+static const struct dma_map_ops arm_dma_iommu_ops = {
 	.alloc		= arm_iommu_alloc_attrs,
 	.free		= arm_iommu_free_attrs,
 	.mmap		= arm_iommu_mmap_attrs,
@@ -1680,7 +1680,7 @@ int arm_iommu_attach_device(struct device *dev,
 	if (err)
 		return err;
 
-	set_dma_ops(dev, &iommu_ops);
+	set_dma_ops(dev, &arm_dma_iommu_ops);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(arm_iommu_attach_device);
@@ -1734,7 +1734,7 @@ static void arm_setup_iommu_dma_ops(struct device *dev)
 		return;
 	}
 
-	set_dma_ops(dev, &iommu_ops);
+	set_dma_ops(dev, &arm_dma_iommu_ops);
 }
 
 static void arm_teardown_iommu_dma_ops(struct device *dev)
-- 
2.43.0