From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751453AbdAQP30 (ORCPT ); Tue, 17 Jan 2017 10:29:26 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:60565 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750892AbdAQP3G (ORCPT ); Tue, 17 Jan 2017 10:29:06 -0500 From: Arnd Bergmann To: Ralf Baechle Cc: linux-mips@linux-mips.org, Arnd Bergmann , Hans-Christian Noren Egtvedt , Vineet Gupta , linux-kernel@vger.kernel.org Subject: [PATCH 11/13] MIPS: octeon: avoid empty-body warning Date: Tue, 17 Jan 2017 16:18:45 +0100 Message-Id: <20170117151911.4109452-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170117151911.4109452-1-arnd@arndb.de> References: <20170117151911.4109452-1-arnd@arndb.de> X-Provags-ID: V03:K0:qtMHpH37Zb8aQVMBYla4j1iiwzvSe+Yx77kHSi+6jKhnDcHtckb gAccpt1n8HfZOLBuB4TgrEGJ8QDF0iiTBMwfBOxYLrlhcV01ANZ1CsEEtOFAhGjzys9lv/+ vYiMGln9A8TLiAbrQ6P4R+D3EagCvb0xv5GVoGgcpx2CZXlxfmyyYPaLnrfnxrbcwsH4V9k H6R/WS/9AMvEuD0MiUsYg== X-UI-Out-Filterresults: notjunk:1;V01:K0:QkvudPq9Rps=:IO1uf52/MBZQ/2pYvb/WIg 3I3dpdrDp5IuCTWPMg5GOPESrqaj4dzvM1dGtGHzjhclvkKBbPLGF0ROX5nSjZqqSmCdQZW7i P93DNlS7kPeXTySWuOS/8wYHxam41E0O6AaadYDf5BvPhtH+LHyQhax+NDPmy2C1FKEk8WPTY TbejSmi3+9boHx2+u/brbVeF08lOqL5XxUXn9mv+z3j+HfJwZdHU89xtn0jPzdeXrv97TwjZJ SR9WS6cNK8xkh3OSyzDn4QH2bX6dH9G2TNEnby+UtmxYWSMRH+h+HwUitv7K6Y5mKvU98v9Ea /jSpBHlb436Js5H9MLexKrR0RihkbcAGGW6ufg63aiM9DMfnYEqC04KD+Jzh5o/nNP7CC9L5u SW87RVCFl+azjpiGhVGPitAdhR6U30FpHbbIxHFEik9RXQ9Ors7gwB0hkW5WsTmRThQ+lcASg qjN18hKqkaCkqd6TRPvyL16hiEZNn/X54d5vsqlS1A98mUwo35xMm2JQmUhFgfJMVm+JV3ahh OIHRog+qIVMl6Y6SqKgPUpuKhk1+sST0l2fbQle+Alt9lH5wAMEGYCezWAc5LlQOMOkygou59 bIKSgcZksAefkcwoMDaK3Vz3B16XsaMkteQCjLf/tuZTMhcZ9QfyE1YxsNzJxzz955GTuT4hx qv/YL/Q5d4DcutFJhcYv1deXzOARbtLbV5TBsXbHamcL9oxuzMK9UMYH76MZGuw1xz4U= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 --- 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