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

[Bastien Nocera]

On Mon, 2017-05-01 at 18:52 -0600, Justin Vreeland wrote:
> Ensure checkpatch compliance
> 
> > Signed-off-by: Justin Vreeland <justin@xxxxxxxxxxxxx>
> ---
> v2:
> Â - Added commit message
> Â - Fixed overly long lines
> 
> Âdrivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 18 ++++++++----------
> Âdrivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 12 ++++++------
> Âdrivers/staging/rtl8723bs/hal/rtl8723bs_xmit.cÂÂ|ÂÂ9 ++++-----
> Â3 files changed, 18 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c b/drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c
> index 28d1a229c3a6..21ec890fd60c 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,8 @@ 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) {

This and...

> Â		if (HAL_STATUS_SUCCESS != ODM_ConfigBBWithHeaderFile(&pHalData->odmpriv, CONFIG_BB_PHY_REG))
> > Â			rtStatus = _FAIL;
> > Â	}
> @@ -491,8 +489,8 @@ 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 +512,8 @@ 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) {

...this and the other such changes below are just way ugly, whatever
the coding style says.