dma-direct: lift gfp_t manipulation out of__dma_direct_alloc_pages

Move the detailed gfp_t setup from __dma_direct_alloc_pages into the
caller to clean things up a little.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>

diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c
index 1d564be..12e9f5f 100644 (file)
--- a/kernel/dma/direct.c
+++ b/kernel/dma/direct.c
@@ -108,7 +108,7 @@ static inline bool dma_should_free_from_pool(struct device *dev,
 }
 
 static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
-               gfp_t gfp, unsigned long attrs)
+               gfp_t gfp)
 {
        int node = dev_to_node(dev);
        struct page *page = NULL;
@@ -116,11 +116,6 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,
 
        WARN_ON_ONCE(!PAGE_ALIGNED(size));
 
-       if (attrs & DMA_ATTR_NO_WARN)
-               gfp |= __GFP_NOWARN;
-
-       /* we always manually zero the memory once we are done: */
-       gfp &= ~__GFP_ZERO;
        gfp |= dma_direct_optimal_gfp_mask(dev, dev->coherent_dma_mask,
                                           &phys_limit);
        page = dma_alloc_contiguous(dev, size, gfp);
@@ -164,6 +159,8 @@ void *dma_direct_alloc(struct device *dev, size_t size,
                return arch_dma_alloc(dev, size, dma_handle, gfp, attrs);
 
        size = PAGE_ALIGN(size);
+       if (attrs & DMA_ATTR_NO_WARN)
+               gfp |= __GFP_NOWARN;
 
        if (dma_should_alloc_from_pool(dev, gfp, attrs)) {
                u64 phys_mask;
@@ -177,7 +174,8 @@ void *dma_direct_alloc(struct device *dev, size_t size,
                goto done;
        }
 
-       page = __dma_direct_alloc_pages(dev, size, gfp, attrs);
+       /* we always manually zero the memory once we are done */
+       page = __dma_direct_alloc_pages(dev, size, gfp & ~__GFP_ZERO);
        if (!page)
                return NULL;