Re: [PATCH 4/7] staging: rtl8723bs: Move braces to same line as conditional

[Larry Finger]

On 04/27/2017 07:09 PM, Justin Vreeland wrote:
> Signed-off-by: Justin Vreeland <justin@xxxxxxxxxxxxx>
> ---
>  drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 15 +++++----------
>  drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c |  9 +++------
>  drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c  |  6 ++----
>  3 files changed, 10 insertions(+), 20 deletions(-)


Fix the over-long lines and add a commit message.

Larry

> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
> index 28d1a229c3a6..2838d5cdd1de 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
> @@ -385,8 +385,7 @@ s32 PHY_MACConfig8723B(struct adapter *Adapter)
>  	/*  Config MAC */
>  	/*  */
>  	rtStatus = phy_ConfigMACWithParaFile(Adapter, pszMACRegFile);
> -	if (rtStatus == _FAIL)
> -	{
> +	if (rtStatus == _FAIL) {
>  		ODM_ConfigMACWithHeaderFile(&pHalData->odmpriv);
>  		rtStatus = _SUCCESS;
>  	}
> @@ -459,8 +458,7 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
>  		Adapter->registrypriv.RegEnableTxPowerLimit == 1 ||
>  		(Adapter->registrypriv.RegEnableTxPowerLimit == 2 && pHalData->EEPROMRegulatory == 1)
>  	) {
> -		if (PHY_ConfigRFWithPowerLimitTableParaFile(Adapter, pszRFTxPwrLmtFile) == _FAIL)
> -		{
> +		if (PHY_ConfigRFWithPowerLimitTableParaFile(Adapter, pszRFTxPwrLmtFile) == _FAIL) {
>  			if (HAL_STATUS_SUCCESS != ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_TXPWR_LMT, (ODM_RF_RADIO_PATH_E)0))
>  				rtStatus = _FAIL;
>  		}
> @@ -474,8 +472,7 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
>  	/*  */
>  	/*  1. Read PHY_REG.TXT BB INIT!! */
>  	/*  */
> -	if (phy_ConfigBBWithParaFile(Adapter, pszBBRegFile, CONFIG_BB_PHY_REG) == _FAIL)
> -	{
> +	if (phy_ConfigBBWithParaFile(Adapter, pszBBRegFile, CONFIG_BB_PHY_REG) == _FAIL) {
>  		if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG))
>  			rtStatus = _FAIL;
>  	}
> @@ -491,8 +488,7 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
>  		Adapter->registrypriv.RegEnableTxPowerByRate == 1 ||
>  		(Adapter->registrypriv.RegEnableTxPowerByRate == 2 && pHalData->EEPROMRegulatory != 2)
>  	) {
> -		if (phy_ConfigBBWithPgParaFile(Adapter, pszBBRegPgFile) == _FAIL)
> -		{
> +		if (phy_ConfigBBWithPgParaFile(Adapter, pszBBRegPgFile) == _FAIL) {
>  			if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG_PG))
>  				rtStatus = _FAIL;
>  		}
> @@ -514,8 +510,7 @@ static int phy_BB8723b_Config_ParaFile(struct adapter *Adapter)
>  	/*  */
>  	/*  2. Read BB AGC table Initialization */
>  	/*  */
> -	if (phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile, CONFIG_BB_AGC_TAB) == _FAIL)
> -	{
> +	if (phy_ConfigBBWithParaFile(Adapter, pszAGCTableFile, CONFIG_BB_AGC_TAB) == _FAIL) {
>  		if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_AGC_TAB))
>  			rtStatus = _FAIL;
>  	}
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
> index 3a85d0cddfda..b2a31a174a7e 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c
> @@ -144,15 +144,13 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
>  		/*----Initialize RF fom connfiguration file----*/
>  		switch (eRFPath) {
>  		case RF_PATH_A:
> -			if (PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, eRFPath) == _FAIL)
> -			{
> +			if (PHY_ConfigRFWithParaFile(Adapter, pszRadioAFile, eRFPath) == _FAIL) {
>  				if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_RADIO, (ODM_RF_RADIO_PATH_E)eRFPath))
>  					rtStatus = _FAIL;
>  			}
>  			break;
>  		case RF_PATH_B:
> -			if (PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile, eRFPath) == _FAIL)
> -			{
> +			if (PHY_ConfigRFWithParaFile(Adapter, pszRadioBFile, eRFPath) == _FAIL) {
>  				if (HAL_STATUS_FAILURE == ODM_ConfigRFWithHeaderFile(&pHalData->odmpriv, CONFIG_RF_RADIO, (ODM_RF_RADIO_PATH_E)eRFPath))
>  					rtStatus = _FAIL;
>  			}
> @@ -186,8 +184,7 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)
>  	/* 3 Configuration of Tx Power Tracking */
>  	/* 3 ----------------------------------------------------------------- */
>
> -	if (PHY_ConfigRFWithTxPwrTrackParaFile(Adapter, pszTxPwrTrackFile) == _FAIL)
> -	{
> +	if (PHY_ConfigRFWithTxPwrTrackParaFile(Adapter, pszTxPwrTrackFile) == _FAIL) {
>  		ODM_ConfigRFWithTxPwrTrackHeaderFile(&pHalData->odmpriv);
>  	}
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> index ca6ad9659b09..4f5e89f829b8 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> @@ -23,8 +23,7 @@ static u8 rtw_sdio_wait_enough_TxOQT_space(struct adapter *padapter, u8 agg_num)
>  	u32 n = 0;
>  	struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
>
> -	while (pHalData->SdioTxOQTFreeSpace < agg_num)
> -	{
> +	while (pHalData->SdioTxOQTFreeSpace < agg_num) {
>  		if (
>  			(padapter->bSurpriseRemoved == true) ||
>  			(padapter->bDriverStopped == true)
> @@ -400,8 +399,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv
>  				pxmitbuf->priv_data = NULL;
>  				enqueue_pending_xmitbuf(pxmitpriv, pxmitbuf);
>  				yield();
> -			}
> -			else
> +			} else
>  				rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
>  			pxmitbuf = NULL;
>  		}