[PATCH] staging: rtl8723au: rtl8723a_hal_init.c: remove unnecessary braces

Jes Sorensen Jes.Sorensen at redhat.com
Mon Feb 23 19:08:40 UTC 2015


Daniele Alessandrelli <daniele.alessandrelli at gmail.com> writes:
> Fix all checkpatch "braces {} are not necessary" warnings for
> rtl8723au/hal/rtl8723a_hal_init.c
>
> Signed-off-by: Daniele Alessandrelli <daniele.alessandrelli at gmail.com>
> ---
>  drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 40 ++++++++---------------
>  1 file changed, 14 insertions(+), 26 deletions(-)

Looks good to me.

Acked-by: Jes Sorensen <Jes.Sorensen at redhat.com>

>
> diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
> index a5eadd4..e88d851 100644
> --- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
> +++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
> @@ -424,9 +424,8 @@ hal_ReadEFuse_WiFi(struct rtw_adapter *padapter,
>  			offset = GET_HDR_OFFSET_2_0(efuseHeader);
>  
>  			ReadEFuseByte23a(padapter, eFuse_Addr++, &efuseExtHdr);
> -			if (ALL_WORDS_DISABLED(efuseExtHdr)) {
> +			if (ALL_WORDS_DISABLED(efuseExtHdr))
>  				continue;
> -			}
>  
>  			offset |= ((efuseExtHdr & 0xF0) >> 1);
>  			wden = (efuseExtHdr & 0x0F);
> @@ -524,9 +523,8 @@ hal_ReadEFuse_BT(struct rtw_adapter *padapter,
>  
>  				ReadEFuseByte23a(padapter, eFuse_Addr++,
>  					      &efuseExtHdr);
> -				if (ALL_WORDS_DISABLED(efuseExtHdr)) {
> +				if (ALL_WORDS_DISABLED(efuseExtHdr))
>  					continue;
> -				}
>  
>  				offset |= ((efuseExtHdr & 0xF0) >> 1);
>  				wden = (efuseExtHdr & 0x0F);
> @@ -630,9 +628,8 @@ u16 rtl8723a_EfuseGetCurrentSize_WiFi(struct rtw_adapter *padapter)
>  			hoffset = GET_HDR_OFFSET_2_0(efuse_data);
>  			efuse_addr++;
>  			efuse_OneByteRead23a(padapter, efuse_addr, &efuse_data);
> -			if (ALL_WORDS_DISABLED(efuse_data)) {
> +			if (ALL_WORDS_DISABLED(efuse_data))
>  				continue;
> -			}
>  
>  			hoffset |= ((efuse_data & 0xF0) >> 1);
>  			hworden = efuse_data & 0x0F;
> @@ -721,9 +718,8 @@ u16 rtl8723a_EfuseGetCurrentSize_BT(struct rtw_adapter *padapter)
>  		}
>  
>  		/*  Check if we need to check next bank efuse */
> -		if (efuse_addr < retU2) {
> +		if (efuse_addr < retU2)
>  			break;	/*  don't need to check next bank. */
> -		}
>  	}
>  
>  	retU2 = ((bank - 1) * EFUSE_BT_REAL_BANK_CONTENT_LEN) + efuse_addr;
> @@ -1149,9 +1145,8 @@ static int _LLTWrite(struct rtw_adapter *padapter, u32 address, u32 data)
>  	/* polling */
>  	do {
>  		value = rtl8723au_read32(padapter, LLTReg);
> -		if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value)) {
> +		if (_LLT_NO_ACTIVE == _LLT_OP_VALUE(value))
>  			break;
> -		}
>  
>  		if (count > POLLING_LLT_THRESHOLD) {
>  			RT_TRACE(_module_hal_init_c_, _drv_err_,
> @@ -1174,16 +1169,14 @@ int InitLLTTable23a(struct rtw_adapter *padapter, u32 boundary)
>  
>  	for (i = 0; i < (txpktbuf_bndy - 1); i++) {
>  		status = _LLTWrite(padapter, i, i + 1);
> -		if (status != _SUCCESS) {
> +		if (status != _SUCCESS)
>  			return status;
> -		}
>  	}
>  
>  	/*  end of list */
>  	status = _LLTWrite(padapter, (txpktbuf_bndy - 1), 0xFF);
> -	if (status != _SUCCESS) {
> +	if (status != _SUCCESS)
>  		return status;
> -	}
>  
>  	/*  Make the other pages as ring buffer */
>  	/*  This ring buffer is used as beacon buffer if we config this
> @@ -1191,16 +1184,14 @@ int InitLLTTable23a(struct rtw_adapter *padapter, u32 boundary)
>  	/*  Otherwise used as local loopback buffer. */
>  	for (i = txpktbuf_bndy; i < Last_Entry_Of_TxPktBuf; i++) {
>  		status = _LLTWrite(padapter, i, (i + 1));
> -		if (_SUCCESS != status) {
> +		if (_SUCCESS != status)
>  			return status;
> -		}
>  	}
>  
>  	/*  Let last entry point to the start entry of ring buffer */
>  	status = _LLTWrite(padapter, Last_Entry_Of_TxPktBuf, txpktbuf_bndy);
> -	if (status != _SUCCESS) {
> +	if (status != _SUCCESS)
>  		return status;
> -	}
>  
>  	return status;
>  }
> @@ -1435,9 +1426,9 @@ static void _DisableAnalog(struct rtw_adapter *padapter, bool bWithoutHWSM)
>  /*  HW Auto state machine */
>  int CardDisableHWSM(struct rtw_adapter *padapter, u8 resetMCU)
>  {
> -	if (padapter->bSurpriseRemoved) {
> +	if (padapter->bSurpriseRemoved)
>  		return _SUCCESS;
> -	}
> +
>  	/*  RF Off Sequence ==== */
>  	_DisableRFAFEAndResetBB8192C(padapter);
>  
> @@ -1459,9 +1450,8 @@ int CardDisableHWSM(struct rtw_adapter *padapter, u8 resetMCU)
>  /*  without HW Auto state machine */
>  int CardDisableWithoutHWSM(struct rtw_adapter *padapter)
>  {
> -	if (padapter->bSurpriseRemoved) {
> +	if (padapter->bSurpriseRemoved)
>  		return _SUCCESS;
> -	}
>  
>  	/*  RF Off Sequence ==== */
>  	_DisableRFAFEAndResetBB8192C(padapter);
> @@ -1875,9 +1865,8 @@ static void rtl8723a_cal_txdesc_chksum(struct tx_desc *ptxdesc)
>  	/*  Clear first */
>  	ptxdesc->txdw7 &= cpu_to_le32(0xffff0000);
>  
> -	for (index = 0; index < count; index++) {
> +	for (index = 0; index < count; index++)
>  		checksum ^= le16_to_cpu(*(usPtr + index));
> -	}
>  
>  	ptxdesc->txdw7 |= cpu_to_le32(checksum & 0x0000ffff);
>  }
> @@ -1925,9 +1914,8 @@ void rtl8723a_fill_fake_txdesc(struct rtw_adapter *padapter, u8 *pDesc,
>  		ptxdesc->txdw3 |= cpu_to_le32((8 << 28));
>  	}
>  
> -	if (true == IsBTQosNull) {
> +	if (true == IsBTQosNull)
>  		ptxdesc->txdw2 |= cpu_to_le32(BIT(23));	/*  BT NULL */
> -	}
>  
>  	/* offset 16 */
>  	ptxdesc->txdw4 |= cpu_to_le32(BIT(8));	/* driver uses rate */


More information about the devel mailing list