diff mbox series

[25/30,for,5.4] dma-pool: get rid of dma_in_atomic_pool()

Message ID	20200925161916.204667-26-pgonda@google.com
State	New
Headers	show Return-Path: <SRS0=ikAt=DC=vger.kernel.org=stable-owner@kernel.org> Sender: "pgonda via sendgmr" <pgonda@pgonda1.kir.corp.google.com> Date: Fri, 25 Sep 2020 09:19:11 -0700 In-Reply-To: <20200925161916.204667-1-pgonda@google.com> Message-Id: <20200925161916.204667-26-pgonda@google.com> Mime-Version: 1.0 References: <20200925161916.204667-1-pgonda@google.com> Subject: [PATCH 25/30 for 5.4] dma-pool: get rid of dma_in_atomic_pool() From: Peter Gonda <pgonda@google.com> To: stable@vger.kernel.org Cc: Peter Gonda <pgonda@google.com>, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>, Christoph Hellwig <hch@lst.de> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	Backport unencrypted non-blocking DMA allocations \| expand [00/30,for,5.4] Backport unencrypted non-blocking DMA allocations [01/30,for,5.4] dma-direct: remove __dma_direct_free_pages [02/30,for,5.4] dma-direct: remove the dma_handle argument to __dma_direct_alloc_pages [03/30,for,5.4] dma-direct: provide mmap and get_sgtable method overrides [04/30,for,5.4] dma-mapping: merge the generic remapping helpers into dma-direct [05/30,for,5.4] lib/genalloc.c: rename addr_in_gen_pool to gen_pool_has_addr [06/30,for,5.4] dma-remap: separate DMA atomic pools from direct remap code [07/30,for,5.4] dma-pool: add additional coherent pools to map to gfp mask [08/30,for,5.4] dma-pool: dynamically expanding atomic pools [09/30,for,5.4] dma-direct: atomic allocations must come from atomic coherent pools [10/30,for,5.4] dma-pool: add pool sizes to debugfs [11/30,for,5.4] x86/mm: unencrypted non-blocking DMA allocations use coherent pools [12/30,for,5.4] dma-pool: scale the default DMA coherent pool size with memory capacity [13/30,for,5.4] dma-pool: fix too large DMA pools on medium memory size systems [14/30,for,5.4] dma-pool: decouple DMA_REMAP from DMA_COHERENT_POOL [15/30,for,5.4] dma-direct: consolidate the error handling in dma_direct_alloc_pages [16/30,for,5.4] xtensa: use the generic uncached segment support [17/30,for,5.4] dma-direct: make uncached_kernel_address more general [18/30,for,5.4] dma-direct: always align allocation size in dma_direct_alloc_pages() [19/30,for,5.4] dma-direct: re-encrypt memory if dma_direct_alloc_pages() fails [20/30,for,5.4] dma-direct: check return value when encrypting or decrypting memory [21/30,for,5.4] dma-direct: add missing set_memory_decrypted() for coherent mapping [22/30,for,5.4] dma-mapping: DMA_COHERENT_POOL should select GENERIC_ALLOCATOR [23/30,for,5.4] dma-mapping: warn when coherent pool is depleted [24/30,for,5.4] dma-direct: provide function to check physical memory area validity [25/30,for,5.4] dma-pool: get rid of dma_in_atomic_pool() [26/30,for,5.4] dma-pool: introduce dma_guess_pool() [27/30,for,5.4] dma-pool: make sure atomic pool suits device [28/30,for,5.4] dma-pool: do not allocate pool memory from CMA [29/30,for,5.4] dma-pool: fix coherent pool allocations for IOMMU mappings [30/30,for,5.4] dma/direct: turn ARCH_ZONE_DMA_BITS into a variable

Commit Message

Peter Gonda Sept. 25, 2020, 4:19 p.m. UTC

From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>

upstream 23e469be6239d9cf3d921fc3e38545491df56534 commit.

The function is only used once and can be simplified to a one-liner.

Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Peter Gonda <pgonda@google.com>
---
 kernel/dma/pool.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff mbox series

Patch

diff --git a/kernel/dma/pool.c b/kernel/dma/pool.c
index 39ca26fa41b5..318035e093fb 100644
--- a/kernel/dma/pool.c
+++ b/kernel/dma/pool.c
@@ -217,15 +217,6 @@  static inline struct gen_pool *dev_to_pool(struct device *dev)
 	return atomic_pool_kernel;
 }
 
-static bool dma_in_atomic_pool(struct device *dev, void *start, size_t size)
-{
-	struct gen_pool *pool = dev_to_pool(dev);
-
-	if (unlikely(!pool))
-		return false;
-	return gen_pool_has_addr(pool, (unsigned long)start, size);
-}
-
 void *dma_alloc_from_pool(struct device *dev, size_t size,
 			  struct page **ret_page, gfp_t flags)
 {
@@ -260,7 +251,7 @@  bool dma_free_from_pool(struct device *dev, void *start, size_t size)
 {
 	struct gen_pool *pool = dev_to_pool(dev);
 
-	if (!dma_in_atomic_pool(dev, start, size))
+	if (!pool || !gen_pool_has_addr(pool, (unsigned long)start, size))
 		return false;
 	gen_pool_free(pool, (unsigned long)start, size);
 	return true;