RE: [PATCH v2 2/3] iwlwifi: mvm: Enclose multi-statement macro in a do while

[Korenblit, Miriam Rachel]

> -----Original Message-----
> From: Juan José Arboleda <soyjuanarbol@xxxxxxxxx>
> Sent: Tuesday, 20 August 2024 0:45
> To: linux-wireless@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Cc: Korenblit, Miriam Rachel <miriam.rachel.korenblit@xxxxxxxxx>;
> kvalo@xxxxxxxxxx; Juan José Arboleda <soyjuanarbol@xxxxxxxxx>
> Subject: [PATCH v2 2/3] iwlwifi: mvm: Enclose multi-statement macro in a do
> while
> 
> This patch encloses the `CHECK_BW` macro inside a do while as preferred by the
> guidelines.
> 
> This change is purely stylistic and do not affect the functionality of the code.
> 
> Signed-off-by: Juan José Arboleda <soyjuanarbol@xxxxxxxxx>
> ---
>  drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
> b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
> index 1a210d0c22b3..6366779ccaf2 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c
> @@ -1043,10 +1043,13 @@ iwl_mvm_decode_he_phy_ru_alloc(struct
> iwl_mvm_rx_phy_data *phy_data,
> 
> 	cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_PRISEC_80_SEC);
> 
>  #define CHECK_BW(bw) \
> -
> 	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SI
> G_A_BW_ ## bw ## MHZ != \
> -		     RATE_MCS_CHAN_WIDTH_##bw >>
> RATE_MCS_CHAN_WIDTH_POS); \
> -	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_ ##
> bw ## MHZ != \
> -		     RATE_MCS_CHAN_WIDTH_##bw >>
> RATE_MCS_CHAN_WIDTH_POS)
> +	do { \
> +
> 	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_MU_FLAGS2_BW_FROM_SI
> G_A_BW_ ## bw ## MHZ != \
> +			     RATE_MCS_CHAN_WIDTH_##bw >>
> RATE_MCS_CHAN_WIDTH_POS); \
> +
> 	BUILD_BUG_ON(IEEE80211_RADIOTAP_HE_DATA6_TB_PPDU_BW_ ##
> bw ## MHZ != \
> +			     RATE_MCS_CHAN_WIDTH_##bw >>
> RATE_MCS_CHAN_WIDTH_POS); \
> +	} while (0)
> +
>  	CHECK_BW(20);
>  	CHECK_BW(40);
>  	CHECK_BW(80);
> --
> 2.46.0

The current usage of CHECK_BW is already safe as it’s only used in standalone contexts where multi-statement expansion poses no risk.
NACK.

Thanks,
Miri