[RFC PATCH 09/30] change alloc_pages name in dma_map_ops to avoid name conflicts

[Suren Baghdasaryan <surenb@xxxxxxxxxx>]

After redefining alloc_pages, all uses of that name are being replaced.
Change the conflicting names to prevent preprocessor from replacing them
when it's not intended.

Signed-off-by: Suren Baghdasaryan <surenb@xxxxxxxxxx>
---
 arch/x86/kernel/amd_gart_64.c | 2 +-
 drivers/iommu/dma-iommu.c     | 2 +-
 drivers/xen/grant-dma-ops.c   | 2 +-
 drivers/xen/swiotlb-xen.c     | 2 +-
 include/linux/dma-map-ops.h   | 2 +-
 kernel/dma/mapping.c          | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/amd_gart_64.c b/arch/x86/kernel/amd_gart_64.c
index 194d54eed537..5e83a387bfef 100644
--- a/arch/x86/kernel/amd_gart_64.c
+++ b/arch/x86/kernel/amd_gart_64.c
@@ -676,7 +676,7 @@ static const struct dma_map_ops gart_dma_ops = {
        .get_sgtable                    = dma_common_get_sgtable,
        .dma_supported                  = dma_direct_supported,
        .get_required_mask              = dma_direct_get_required_mask,
-       .alloc_pages                    = dma_direct_alloc_pages,
+       .alloc_pages_op                 = dma_direct_alloc_pages,
        .free_pages                     = dma_direct_free_pages,
 };
 
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 17dd683b2fce..58b4878ef930 100644
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -1547,7 +1547,7 @@ static const struct dma_map_ops iommu_dma_ops = {
        .flags                  = DMA_F_PCI_P2PDMA_SUPPORTED,
        .alloc                  = iommu_dma_alloc,
        .free                   = iommu_dma_free,
-       .alloc_pages            = dma_common_alloc_pages,
+       .alloc_pages_op         = dma_common_alloc_pages,
        .free_pages             = dma_common_free_pages,
        .alloc_noncontiguous    = iommu_dma_alloc_noncontiguous,
        .free_noncontiguous     = iommu_dma_free_noncontiguous,
diff --git a/drivers/xen/grant-dma-ops.c b/drivers/xen/grant-dma-ops.c
index 8973fc1e9ccc..0e26d066036e 100644
--- a/drivers/xen/grant-dma-ops.c
+++ b/drivers/xen/grant-dma-ops.c
@@ -262,7 +262,7 @@ static int xen_grant_dma_supported(struct device *dev, u64 
mask)
 static const struct dma_map_ops xen_grant_dma_ops = {
        .alloc = xen_grant_dma_alloc,
        .free = xen_grant_dma_free,
-       .alloc_pages = xen_grant_dma_alloc_pages,
+       .alloc_pages_op = xen_grant_dma_alloc_pages,
        .free_pages = xen_grant_dma_free_pages,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c
index 67aa74d20162..5ab2616153f0 100644
--- a/drivers/xen/swiotlb-xen.c
+++ b/drivers/xen/swiotlb-xen.c
@@ -403,6 +403,6 @@ const struct dma_map_ops xen_swiotlb_dma_ops = {
        .dma_supported = xen_swiotlb_dma_supported,
        .mmap = dma_common_mmap,
        .get_sgtable = dma_common_get_sgtable,
-       .alloc_pages = dma_common_alloc_pages,
+       .alloc_pages_op = dma_common_alloc_pages,
        .free_pages = dma_common_free_pages,
 };
diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
index d678afeb8a13..e8e2d210ba68 100644
--- a/include/linux/dma-map-ops.h
+++ b/include/linux/dma-map-ops.h
@@ -27,7 +27,7 @@ struct dma_map_ops {
                        unsigned long attrs);
        void (*free)(struct device *dev, size_t size, void *vaddr,
                        dma_addr_t dma_handle, unsigned long attrs);
-       struct page *(*alloc_pages)(struct device *dev, size_t size,
+       struct page *(*alloc_pages_op)(struct device *dev, size_t size,
                        dma_addr_t *dma_handle, enum dma_data_direction dir,
                        gfp_t gfp);
        void (*free_pages)(struct device *dev, size_t size, struct page *vaddr,
diff --git a/kernel/dma/mapping.c b/kernel/dma/mapping.c
index 49cbf3e33de7..80a2bfeed8d0 100644
--- a/kernel/dma/mapping.c
+++ b/kernel/dma/mapping.c
@@ -552,9 +552,9 @@ static struct page *__dma_alloc_pages(struct device *dev, 
size_t size,
        size = PAGE_ALIGN(size);
        if (dma_alloc_direct(dev, ops))
                return dma_direct_alloc_pages(dev, size, dma_handle, dir, gfp);
-       if (!ops->alloc_pages)
+       if (!ops->alloc_pages_op)
                return NULL;
-       return ops->alloc_pages(dev, size, dma_handle, dir, gfp);
+       return ops->alloc_pages_op(dev, size, dma_handle, dir, gfp);
 }
 
 struct page *dma_alloc_pages(struct device *dev, size_t size,
-- 
2.37.2.672.g94769d06f0-goog