[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <bc4a4ba7c07a4077b9790be883fb4205d401804e.camel@perches.com>
Date: Mon, 20 Dec 2021 04:13:20 -0800
From: Joe Perches <joe@...ches.com>
To: Anders Roxell <anders.roxell@...aro.org>, stable@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, woojung.huh@...rochip.com,
UNGLinuxDriver@...rochip.com, davem@...emloft.net,
netdev@...r.kernel.org, linux-usb@...r.kernel.org,
clang-built-linux@...glegroups.com, ulli.kroll@...glemail.com,
linux@...linux.org.uk, linux-arm-kernel@...ts.infradead.org,
amitkarwar@...il.com, nishants@...vell.com, gbhat@...vell.com,
huxinming820@...il.com, kvalo@...eaurora.org,
linux-wireless@...r.kernel.org, rostedt@...dmis.org,
mingo@...hat.com, dmitry.torokhov@...il.com,
ndesaulniers@...gle.com, nathan@...nel.org,
linux-input@...r.kernel.org,
Nathan Chancellor <natechancellor@...il.com>,
Andy Lavr <andy.lavr@...il.com>
Subject: Re: [PATCH 4.19 3/6] mwifiex: Remove unnecessary braces from
HostCmd_SET_SEQ_NO_BSS_INFO
On Fri, 2021-12-17 at 15:41 +0100, Anders Roxell wrote:
> From: Nathan Chancellor <natechancellor@...il.com>
>
> commit 6a953dc4dbd1c7057fb765a24f37a5e953c85fb0 upstream.
>
> A new warning in clang points out when macro expansion might result in a
> GNU C statement expression. There is an instance of this in the mwifiex
> driver:
>
> drivers/net/wireless/marvell/mwifiex/cmdevt.c:217:34: warning: '}' and
> ')' tokens terminating statement expression appear in different macro
> expansion contexts [-Wcompound-token-split-by-macro]
> host_cmd->seq_num = cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~
[]
> diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
[]
> @@ -512,10 +512,10 @@ enum mwifiex_channel_flags {
>
> #define RF_ANTENNA_AUTO 0xFFFF
>
> -#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) { \
> - (((seq) & 0x00ff) | \
> - (((num) & 0x000f) << 8)) | \
> - (((type) & 0x000f) << 12); }
> +#define HostCmd_SET_SEQ_NO_BSS_INFO(seq, num, type) \
> + ((((seq) & 0x00ff) | \
> + (((num) & 0x000f) << 8)) | \
> + (((type) & 0x000f) << 12))
Perhaps this would be better as a static inline
static inline u16 HostCmd_SET_SEQ_NO_BSS_INFO(u16 seq, u8 num, u8 type)
{
return (type & 0x000f) << 12 | (num & 0x000f) << 8 | (seq & 0x00ff);
}
Powered by blists - more mailing lists