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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <4d7895e9-5554-8cfa-f33f-37f84c1d26db@caviumnetworks.com>
Date:   Tue, 17 Jan 2017 12:00:23 -0800
From:   David Daney <ddaney@...iumnetworks.com>
To:     Arnd Bergmann <arnd@...db.de>, Ralf Baechle <ralf@...ux-mips.org>,
        "Hill, Steven" <Steven.Hill@...iumnetworks.com>
CC:     <linux-mips@...ux-mips.org>,
        Hans-Christian Noren Egtvedt <egtvedt@...fundet.no>,
        Vineet Gupta <vgupta@...opsys.com>,
        <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 11/13] MIPS: octeon: avoid empty-body warning

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@...db.de>

Reviewed-by: David Daney <david.daney@...ium.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;
>