arm: remove wrappers for the generic dma remap helpers

Remove a few tiny wrappers around the generic dma remap code.

Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 5 insertions, 27 deletions

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 97bf57df87c1..d98898893140 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -339,18 +339,6 @@ static void *__alloc_remap_buffer(struct device *dev, size_t size, gfp_t gfp,
                                  pgprot_t prot, struct page **ret_page,
                                  const void *caller, bool want_vaddr);
 
-static void *
-__dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot,
-        const void *caller)
-{
-        return dma_common_contiguous_remap(page, size, prot, caller);
-}
-
-static void __dma_free_remap(void *cpu_addr, size_t size)
-{
-        dma_common_free_remap(cpu_addr, size);
-}
-
 #define DEFAULT_DMA_COHERENT_POOL_SIZE  SZ_256K
 static struct gen_pool *atomic_pool __ro_after_init;
 
@@ -506,7 +494,7 @@ static void *__alloc_remap_buffer(struct device *dev, size_t size, gfp_t gfp,
         if (!want_vaddr)
                 goto out;
 
-        ptr = __dma_alloc_remap(page, size, gfp, prot, caller);
+        ptr = dma_common_contiguous_remap(page, size, prot, caller);
         if (!ptr) {
                 __dma_free_buffer(page, size);
                 return NULL;
@@ -573,7 +561,7 @@ static void *__alloc_from_contiguous(struct device *dev, size_t size,
                 goto out;
 
         if (PageHighMem(page)) {
-                ptr = __dma_alloc_remap(page, size, GFP_KERNEL, prot, caller);
+                ptr = dma_common_contiguous_remap(page, size, prot, caller);
                 if (!ptr) {
                         dma_release_from_contiguous(dev, page, count);
                         return NULL;
@@ -593,7 +581,7 @@ static void __free_from_contiguous(struct device *dev, struct page *page,
 {
         if (want_vaddr) {
                 if (PageHighMem(page))
-                        __dma_free_remap(cpu_addr, size);
+                        dma_common_free_remap(cpu_addr, size);
                 else
                         __dma_remap(page, size, PAGE_KERNEL);
         }
@@ -685,7 +673,7 @@ static void *remap_allocator_alloc(struct arm_dma_alloc_args *args,
 static void remap_allocator_free(struct arm_dma_free_args *args)
 {
         if (args->want_vaddr)
-                __dma_free_remap(args->cpu_addr, args->size);
+                dma_common_free_remap(args->cpu_addr, args->size);
 
         __dma_free_buffer(args->page, args->size);
 }
@@ -1358,16 +1346,6 @@ static int __iommu_free_buffer(struct device *dev, struct page **pages,
 }
 
 /*
- * Create a CPU mapping for a specified pages
- */
-static void *
-__iommu_alloc_remap(struct page **pages, size_t size, gfp_t gfp, pgprot_t prot,
-                    const void *caller)
-{
-        return dma_common_pages_remap(pages, size, prot, caller);
-}
-
-/*
  * Create a mapping in device IO address space for specified pages
  */
 static dma_addr_t
@@ -1518,7 +1496,7 @@ static void *__arm_iommu_alloc_attrs(struct device *dev, size_t size,
         if (attrs & DMA_ATTR_NO_KERNEL_MAPPING)
                 return pages;
 
-        addr = __iommu_alloc_remap(pages, size, gfp, prot,
+        addr = dma_common_pages_remap(pages, size, prot,
                                    __builtin_return_address(0));
         if (!addr)
                 goto err_mapping;