From 6dff252b1a74db01ec3ba8b40eae78a587d2a951 Mon Sep 17 00:00:00 2001 From: Olav Haugan Date: Mon, 12 Jun 2017 13:32:35 -0700 Subject: [PATCH] arm64/dma-mapping: Remove extraneous null-pointer checks The current null-pointer check in __dma_alloc_coherent and __dma_free_coherent is not needed anymore since the __dma_alloc/__dma_free functions won't be called if !dev (dummy ops will be called instead). Change-Id: I037c6fab4626dd0fc3ab13313a202ad14c8454b0 Signed-off-by: Olav Haugan --- arch/arm64/include/asm/dma-mapping.h | 2 -- arch/arm64/mm/dma-mapping.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h index b89a7f382c6c..0f2704c7e959 100644 --- a/arch/arm64/include/asm/dma-mapping.h +++ b/arch/arm64/include/asm/dma-mapping.h @@ -65,8 +65,6 @@ void arch_teardown_dma_ops(struct device *dev); /* do not use this function in a driver */ static inline bool is_device_dma_coherent(struct device *dev) { - if (!dev) - return false; return dev->archdata.dma_coherent; } diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 75088c00cbf1..927cc5f276cd 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -157,11 +157,6 @@ static void *__dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flags, unsigned long attrs) { - if (dev == NULL) { - WARN_ONCE(1, "Use an actual device structure for DMA allocation\n"); - return NULL; - } - if (IS_ENABLED(CONFIG_ZONE_DMA) && dev->coherent_dma_mask <= DMA_BIT_MASK(32)) flags |= GFP_DMA; @@ -201,10 +196,6 @@ static void __dma_free_coherent(struct device *dev, size_t size, phys_addr_t paddr = dma_to_phys(dev, dma_handle); size = PAGE_ALIGN(size); - if (dev == NULL) { - WARN_ONCE(1, "Use an actual device structure for DMA allocation\n"); - return; - } if ((attrs & DMA_ATTR_NO_KERNEL_MAPPING) || (attrs & DMA_ATTR_STRONGLY_ORDERED))