Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1560709

[PATCH 10/13] MIPS: loongson64: fix empty-body warning in dma_alloc

Show all headers | View raw

A new gcc warning shows up for this old code with gcc-6:

arch/mips/loongson64/common/dma-swiotlb.c: In function 'loongson_dma_alloc_coherent':
arch/mips/loongson64/common/dma-swiotlb.c:35:2: error: suggest braces around empty body in an 'else' statement [-Werror=empty-body]

The code can be easily restructured to look more readable
and avoid the warning at the same time.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/mips/loongson64/common/dma-swiotlb.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/arch/mips/loongson64/common/dma-swiotlb.c b/arch/mips/loongson64/common/dma-swiotlb.c
index aab4fd681e1f..df7235e33499 100644
--- a/arch/mips/loongson64/common/dma-swiotlb.c
+++ b/arch/mips/loongson64/common/dma-swiotlb.c
@@ -17,22 +17,14 @@ static void *loongson_dma_alloc_coherent(struct device *dev, size_t size,
 	/* ignore region specifiers */
 	gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
 
-#ifdef CONFIG_ISA
-	if (dev == NULL)
+	if ((IS_ENABLED(CONFIG_ISA) && dev == NULL) ||
+	    (IS_ENABLED(CONFIG_ZONE_DMA) &&
+	     dev->coherent_dma_mask < DMA_BIT_MASK(32)))
 		gfp |= __GFP_DMA;
-	else
-#endif
-#ifdef CONFIG_ZONE_DMA
-	if (dev->coherent_dma_mask < DMA_BIT_MASK(32))
-		gfp |= __GFP_DMA;
-	else
-#endif
-#ifdef CONFIG_ZONE_DMA32
-	if (dev->coherent_dma_mask < DMA_BIT_MASK(40))
+	else if (IS_ENABLED(CONFIG_ZONE_DMA32) &&
+		 dev->coherent_dma_mask < DMA_BIT_MASK(40))
 		gfp |= __GFP_DMA32;
-	else
-#endif
-	;
+
 	gfp |= __GFP_NORETRY;
 
 	ret = swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
-- 
2.9.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 01/13] MIPS: fix modversions Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 03/13] MIPS: 'make -s' should be silent Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 10/13] MIPS: loongson64: fix empty-body warning in dma_alloc Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 06/13] MIPS: Lantiq: Fix another request_mem_region() return code check Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 09/13] MIPS: ralink: remove unused rt*_wdt_reset functions Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 13/13] MIPS: avoid old-style declaration Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 02/13] MIPS: VDSO: avoid duplicate CAC_BASE definition Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100
  [PATCH 12/13] MIPS: ip22: fix ip28 build for modern gcc Arnd Bergmann <arnd@arndb.de> - 2017-01-17 16:30 +0100

csiph-web