From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751414AbdAQP2C (ORCPT ); Tue, 17 Jan 2017 10:28:02 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:50968 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbdAQP2A (ORCPT ); Tue, 17 Jan 2017 10:28:00 -0500 From: Arnd Bergmann To: Ralf Baechle Cc: linux-mips@linux-mips.org, Arnd Bergmann , Robin Murphy , linux-kernel@vger.kernel.org Subject: [PATCH 10/13] MIPS: loongson64: fix empty-body warning in dma_alloc Date: Tue, 17 Jan 2017 16:18:44 +0100 Message-Id: <20170117151911.4109452-10-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:bNT879+tbA+DugZtVst12orWGQ+4bIkzK+HV139mp4Pjme5MCyr tbRJcugsg4WkiKxt1t0IsCAFmGBuI8LinuqZuBRtkgiC+9NUCajrFSI4p6vvuf4ck+Owulq 2rCZbrz1UUQLr+Gn5bjiSVYYYeT0D7wdb3oHQYn1jB526KH1CTOOTQ5NTJT3EetjVorFlk2 ZisixScDY9pv0bo5NUUUQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:CosjtRqoscA=:RffA0VNvubD0AdQEmclyKy 2J/mrkW8AjboYb2DkX8MGmGs78DVodKvQiFUp5I0I1tZ17YSp54jCkzc/iQmsucEffiK/bmcV wPJir9vCwZuwEzEtN8dA3mKgNvI71qDTj1kWFiOpIzl3QHskZas+qtDiQ7Vqe0qKymo4eJfTb Kbzqwo+/04Kf/ydKoSYDHJjnuaxKs9VRJruJ4A8FjvBTSdmD7XXrQfpMx1uHkwbMkydMaK+D1 E1PDOTV2JfdP10TENLpjYEfHrtuPvEYUIhJlGlFp2spMHpTK5TIM9gsMQldHJB4Dbsn6Xnfty NxgpPmxmUYBRzYMUlW144S6cJiuCxoY8YeAAeNDe+RcDwTUAAoS4iv8nt6SzM9V1I1MEYCzTt RF4GYK4orzsQCBLeBNbDY83NUH55+cQYg/u9b7rYxR+t8TZrFSoAizxEpy4RhjSldRuMUJfLJ AqvaaWgVRcuMsP1R8D8hX77ncs6CAqfj1GlQHMbfYIUsHM/hIclrRhbF7oBo5JLCQO5gY3fyB /PRr6S0tyGCdML723i55jiren/DUZ5MB0q3jAa5FkMwbnfmrQkAFkkJhZdsV3CKGWw37CbmU0 7bd/o7fB4f1mw90lSjF82jtQvvTB0Bo/l6ryp3LSyCKAa8W9g1oMcRh5sJi3eo5Xb3zuNsQ+y 9oPgXZhkZziNSdCcT7iFEyfEziFbRlqCdYgIbqNBCvvz853BvP1gTrSONOaPKHEHk9dM= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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