Re: [PATCH] staging: rtl8723bs: remove braces in single statement blocks

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

Thank you for your patch.

This patch actually changes how the code works (se below),
so NACK to this patch.

On 9/13/22 15:06, Kang Minchul wrote:
> This commit cleans up checkpatch warning as follows:Hi,
> WARNING: braces {} are not necessary for single statement blocks
> 
> Signed-off-by: Kang Minchul <tegongkang@xxxxxxxxx>
> ---
>  drivers/staging/rtl8723bs/core/rtw_recv.c | 19 ++++++-------------
>  1 file changed, 6 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
> index d8d394b67eeb..f20eba7fa471 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
> @@ -1374,9 +1374,8 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame
>  			/* actual management data frame body */
>  			data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
>  			mgmt_DATA = rtw_zmalloc(data_len);
> -			if (!mgmt_DATA) {
> +			if (!mgmt_DATA)
>  				goto validate_80211w_fail;
> -			}
>  			precv_frame = decryptor(adapter, precv_frame);
>  			/* save actual management data frame body */
>  			memcpy(mgmt_DATA, ptr+pattrib->hdrlen+pattrib->iv_len, data_len);
> @@ -1385,9 +1384,8 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame
>  			/* remove the iv and icv length */
>  			pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
>  			kfree(mgmt_DATA);
> -			if (!precv_frame) {
> +			if (!precv_frame)
>  				goto validate_80211w_fail;
> -			}
>  		} else if (IS_MCAST(GetAddr1Ptr(ptr)) &&
>  			(subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC)) {
>  			signed int BIP_ret = _SUCCESS;
> @@ -1651,14 +1649,12 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
>  	u16 wend = (preorder_ctrl->indicate_seq + wsize - 1) & 0xFFF;/*  4096; */
>  
>  	/*  Rx Reorder initialize condition. */
> -	if (preorder_ctrl->indicate_seq == 0xFFFF) {
> +	if (preorder_ctrl->indicate_seq == 0xFFFF)
>  		preorder_ctrl->indicate_seq = seq_num;
> -	}
>  
>  	/*  Drop out the packet which SeqNum is smaller than WinStart */
> -	if (SN_LESS(seq_num, preorder_ctrl->indicate_seq)) {
> +	if (SN_LESS(seq_num, preorder_ctrl->indicate_seq))
>  		return false;
> -	}
>  
>  	/*  */
>  	/*  Sliding window manipulation. Conditions includes: */
> @@ -1862,8 +1858,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
>  
>  			preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
>  
> -			if (retval != _SUCCESS) {
> -			}
> +			if (retval != _SUCCESS)
>  
>  			return retval;
>  		}

This effectively changes the code from:

			if (retval != _SUCCESSS) {
				/* Do nothing */
			}

			return retval;

to:

			if (retval != _SUCCESSS)
				return retval;

			/* continue executing next statements ! */

So now when value == _SUCCESS execution will continue instead of returning
_SUCCESS, changing how the code works.

Regards,

Hans



> @@ -2084,10 +2079,8 @@ s32 rtw_recv_entry(union recv_frame *precvframe)
>  	precvpriv = &padapter->recvpriv;
>  
>  	ret = recv_func(padapter, precvframe);
> -	if (ret == _FAIL) {
> +	if (ret == _FAIL)
>  		goto _recv_entry_drop;
> -	}
> -
>  
>  	precvpriv->rx_pkts++;
>  





[Index of Archives]     [Linux Driver Development]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux