linux-mips
[Top] [All Lists]

[PATCH 11/13] MIPS: octeon: avoid empty-body warning

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [PATCH 11/13] MIPS: octeon: avoid empty-body warning
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 17 Jan 2017 16:18:45 +0100
Cc: linux-mips@linux-mips.org, Arnd Bergmann <arnd@arndb.de>, Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>, Vineet Gupta <vgupta@synopsys.com>, linux-kernel@vger.kernel.org
In-reply-to: <20170117151911.4109452-1-arnd@arndb.de>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20170117151911.4109452-1-arnd@arndb.de>
Sender: linux-mips-bounce@linux-mips.org
gcc-6 reports a harmless build warning:

arch/mips/cavium-octeon/dma-octeon.c: In function 'octeon_dma_alloc_coherent':
arch/mips/cavium-octeon/dma-octeon.c:179:3: error: suggest braces around empty 
body in an 'else' statement [-Werror=empty-body]

We can fix this by rearranging the code slightly using the
IS_ENABLED() macro.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 arch/mips/cavium-octeon/dma-octeon.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/arch/mips/cavium-octeon/dma-octeon.c 
b/arch/mips/cavium-octeon/dma-octeon.c
index fd69528b24fb..1226965e1e4f 100644
--- a/arch/mips/cavium-octeon/dma-octeon.c
+++ b/arch/mips/cavium-octeon/dma-octeon.c
@@ -164,19 +164,14 @@ static void *octeon_dma_alloc_coherent(struct device 
*dev, size_t size,
        /* ignore region specifiers */
        gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);
 
-#ifdef CONFIG_ZONE_DMA
-       if (dev == NULL)
+       if (IS_ENABLED(CONFIG_ZONE_DMA) && dev == NULL)
                gfp |= __GFP_DMA;
-       else if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))
+       else if (IS_ENABLED(CONFIG_ZONE_DMA) &&
+                dev->coherent_dma_mask <= DMA_BIT_MASK(24))
                gfp |= __GFP_DMA;
-       else
-#endif
-#ifdef CONFIG_ZONE_DMA32
-            if (dev->coherent_dma_mask <= DMA_BIT_MASK(32))
+       else if (IS_ENABLED(CONFIG_ZONE_DMA32) &&
+                dev->coherent_dma_mask <= DMA_BIT_MASK(32))
                gfp |= __GFP_DMA32;
-       else
-#endif
-               ;
 
        /* Don't invoke OOM killer */
        gfp |= __GFP_NORETRY;
-- 
2.9.0


<Prev in Thread] Current Thread [Next in Thread>