lkml.org 
[lkml]   [2017]   [Jan]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 11/13] MIPS: octeon: avoid empty-body warning
From
Date
On 01/17/2017 07:18 AM, Arnd Bergmann wrote:
> 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>

Reviewed-by: David Daney <david.daney@cavium.com>

Steven: Please test this patch.


Thanks,
David Daney

> ---
> 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;
>

\
 
 \ /
  Last update: 2017-01-17 21:01    [W:0.351 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site