iommu/dma: Prune redundant pgprot arguments

Somewhere amongst previous refactorings, the pgprot value in
__iommu_dma_alloc_noncontiguous() became entirely unused, and the one
used in iommu_dma_alloc_remap() can be computed locally rather than by
its one remaining caller. Clean 'em up.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/c2a81b72df59a71a13f8bad94f834e627c4c93dd.1717504749.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c
index 43520e7275cc12818c2a056cc00d0a539792f1da..18603d63ad3ffec42a67129817cae08c982dbb51 100644 (file)
--- a/drivers/iommu/dma-iommu.c
+++ b/drivers/iommu/dma-iommu.c
@@ -939,8 +939,7 @@ static struct page **__iommu_dma_alloc_pages(struct device *dev,
  * but an IOMMU which supports smaller pages might not map the whole thing.
  */
 static struct page **__iommu_dma_alloc_noncontiguous(struct device *dev,
-               size_t size, struct sg_table *sgt, gfp_t gfp, pgprot_t prot,
-               unsigned long attrs)
+               size_t size, struct sg_table *sgt, gfp_t gfp, unsigned long attrs)
 {
        struct iommu_domain *domain = iommu_get_dma_domain(dev);
        struct iommu_dma_cookie *cookie = domain->iova_cookie;
@@ -1014,15 +1013,14 @@ out_free_pages:
 }
 
 static void *iommu_dma_alloc_remap(struct device *dev, size_t size,
-               dma_addr_t *dma_handle, gfp_t gfp, pgprot_t prot,
-               unsigned long attrs)
+               dma_addr_t *dma_handle, gfp_t gfp, unsigned long attrs)
 {
        struct page **pages;
        struct sg_table sgt;
        void *vaddr;
+       pgprot_t prot = dma_pgprot(dev, PAGE_KERNEL, attrs);
 
-       pages = __iommu_dma_alloc_noncontiguous(dev, size, &sgt, gfp, prot,
-                                               attrs);
+       pages = __iommu_dma_alloc_noncontiguous(dev, size, &sgt, gfp, attrs);
        if (!pages)
                return NULL;
        *dma_handle = sgt.sgl->dma_address;
@@ -1049,8 +1047,7 @@ static struct sg_table *iommu_dma_alloc_noncontiguous(struct device *dev,
        if (!sh)
                return NULL;
 
-       sh->pages = __iommu_dma_alloc_noncontiguous(dev, size, &sh->sgt, gfp,
-                                                   PAGE_KERNEL, attrs);
+       sh->pages = __iommu_dma_alloc_noncontiguous(dev, size, &sh->sgt, gfp, attrs);
        if (!sh->pages) {
                kfree(sh);
                return NULL;
@@ -1619,8 +1616,7 @@ static void *iommu_dma_alloc(struct device *dev, size_t size,
 
        if (gfpflags_allow_blocking(gfp) &&
            !(attrs & DMA_ATTR_FORCE_CONTIGUOUS)) {
-               return iommu_dma_alloc_remap(dev, size, handle, gfp,
-                               dma_pgprot(dev, PAGE_KERNEL, attrs), attrs);
+               return iommu_dma_alloc_remap(dev, size, handle, gfp, attrs);
        }
 
        if (IS_ENABLED(CONFIG_DMA_DIRECT_REMAP) &&