staging: rtl8723bs: remove unnecessary braces in HalBtc8723b2Ant.c
PATCH 1/1 staging: rtl8723bs: remove unnecessary braces in HalBtc8723b2Ant.c
Remove unnecessary curly braces around single statement if/else blocks throughout the file, as flagged by checkpatch.pl.
Signed-off-by Raushan Kumar <[email protected]>
--- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 118 +++++++----------- 1 file changed, 48 insertions(+), 70 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +48 -70
@@ -35,49 +35,43 @@ static u8 halbtc8723b2ant_BtRssiState( (pCoexSta->preBtRssiState == BTC_RSSI_STATE_LOW) || (pCoexSta->preBtRssiState == BTC_RSSI_STATE_STAY_LOW) ) { - if (btRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (btRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) btRssiState = BTC_RSSI_STATE_HIGH; - } else { + else btRssiState = BTC_RSSI_STATE_STAY_LOW; - } } else { -if (btRssi < rssiThresh) { +if (btRssi < rssiThresh) btRssiState =BTC_RSSI_STATE_LOW ; - }else { +else btRssiState =BTC_RSSI_STATE_STAY_HIGH ; - } } }else if (levelNum ==3 ) { -if (rssiThresh > rssiThresh1) { +if (rssiThresh > rssiThresh1)return pCoexSta->preBtRssiState; - }if ( (pCoexSta->preBtRssiState ==BTC_RSSI_STATE_LOW ) || (pCoexSta->preBtRssiState ==BTC_RSSI_STATE_STAY_LOW ) ) { -if (btRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) { +if (btRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) btRssiState =BTC_RSSI_STATE_MEDIUM ; - }else { +else btRssiState =BTC_RSSI_STATE_STAY_LOW ; - } }else if ( (pCoexSta->preBtRssiState ==BTC_RSSI_STATE_MEDIUM ) || (pCoexSta->preBtRssiState ==BTC_RSSI_STATE_STAY_MEDIUM ) ) { -if (btRssi >= (rssiThresh1 +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) { +if (btRssi >= (rssiThresh1 +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) btRssiState =BTC_RSSI_STATE_HIGH ; - }else if (btRssi < rssiThresh) { +else if (btRssi < rssiThresh) btRssiState =BTC_RSSI_STATE_LOW ; - }else { +else btRssiState =BTC_RSSI_STATE_STAY_MEDIUM ; - } }else { -if (btRssi < rssiThresh1) { +if (btRssi < rssiThresh1) btRssiState =BTC_RSSI_STATE_MEDIUM ; - }else { +else btRssiState =BTC_RSSI_STATE_STAY_HIGH ; - } } }
@@ -104,49 +98,43 @@ static u8 halbtc8723b2ant_WifiRssiState( (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_LOW) || (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_LOW) ) { - if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) { + if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT)) wifiRssiState = BTC_RSSI_STATE_HIGH; - } else { + else wifiRssiState = BTC_RSSI_STATE_STAY_LOW; - } } else { -if (wifiRssi < rssiThresh) { +if (wifiRssi < rssiThresh) wifiRssiState =BTC_RSSI_STATE_LOW ; - }else { +else wifiRssiState =BTC_RSSI_STATE_STAY_HIGH ; - } } }else if (levelNum ==3 ) { -if (rssiThresh > rssiThresh1) { +if (rssiThresh > rssiThresh1)return pCoexSta->preWifiRssiState[index]; - }if ( (pCoexSta->preWifiRssiState[index] ==BTC_RSSI_STATE_LOW ) || (pCoexSta->preWifiRssiState[index] ==BTC_RSSI_STATE_STAY_LOW ) ) { -if (wifiRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) { +if (wifiRssi >= (rssiThresh +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) wifiRssiState =BTC_RSSI_STATE_MEDIUM ; - }else { +else wifiRssiState =BTC_RSSI_STATE_STAY_LOW ; - } }else if ( (pCoexSta->preWifiRssiState[index] ==BTC_RSSI_STATE_MEDIUM ) || (pCoexSta->preWifiRssiState[index] ==BTC_RSSI_STATE_STAY_MEDIUM ) ) { -if (wifiRssi >= (rssiThresh1 +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) { +if (wifiRssi >= (rssiThresh1 +BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT )) wifiRssiState =BTC_RSSI_STATE_HIGH ; - }else if (wifiRssi < rssiThresh) { +else if (wifiRssi < rssiThresh) wifiRssiState =BTC_RSSI_STATE_LOW ; - }else { +else wifiRssiState =BTC_RSSI_STATE_STAY_MEDIUM ; - } }else { -if (wifiRssi < rssiThresh1) { +if (wifiRssi < rssiThresh1) wifiRssiState =BTC_RSSI_STATE_MEDIUM ; - }else { +else wifiRssiState =BTC_RSSI_STATE_STAY_HIGH ; - } } }
@@ -168,7 +156,7 @@ static void halbtc8723b2ant_LimitedRx(u8 rxAggSize = aggBufSize;/* */ -/* Rx Aggregation related setting */ +/* Rx Aggregation related setting */ /* */ pBtCoexist->fBtcSet (pBtCoexist,BTC_SET_BL_TO_REJ_AP_AGG_PKT , &bRejectRxAgg);/* decide BT control aggregation buf size or not */
@@ -181,7 +169,7 @@ static void halbtc8723b2ant_LimitedRx(static void halbtc8723b2ant_QueryBtInfo (struct btc_coexist *pBtCoexist) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; pCoexSta->bC2hBtInfoReqSent = true;
@@ -318,11 +306,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) }else if (pBtLinkInfo->bA2dpExist) { algorithm =BT_8723B_2ANT_COEX_ALGO_A2DP ; }else if (pBtLinkInfo->bPanExist) { -if (bBtHsOn) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_PANHS ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR ; - } } } }else if (numOfDiffProfile ==2 ) {
@@ -332,11 +319,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) }else if (pBtLinkInfo->bA2dpExist) { algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; }else if (pBtLinkInfo->bPanExist) { -if (bBtHsOn) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_SCO ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - } } }else { if (
@@ -348,20 +334,18 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist ) { -if (bBtHsOn) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_HID ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - } } else if ( pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { -if (bBtHsOn) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_A2DP_PANHS ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_A2DP ; - } } } }else if (numOfDiffProfile ==3 ) {
@@ -388,11 +372,10 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist ) { -if (bBtHsOn) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_HID_A2DP ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_HID_A2DP_PANEDR ; - } } } }else if (numOfDiffProfile >=3 ) {
@@ -417,7 +400,7 @@ static void halbtc8723b2ant_SetFwDacSwingLevel( struct btc_coexist *pBtCoexist, u8 dacSwingLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };/* There are several type of dacswing */ /* 0x18/ 0x10/ 0xc/ 0x8/ 0x4/ 0x6 */
@@ -430,7 +413,7 @@ static void halbtc8723b2ant_SetFwDecBtPwr( struct btc_coexist *pBtCoexist, u8 decBtPwrLvl ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 }; H2C_Parameter[0 ] = decBtPwrLvl;
@@ -473,16 +456,14 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner(bool bRxRfShrinkOn ) { -if (bRxRfShrinkOn) { +if (bRxRfShrinkOn)/* Shrink RF Rx LPF corner */ pBtCoexist->fBtcSetRfReg (pBtCoexist,BTC_RF_A ,0x1e ,0xfffff ,0xffffc ); - }else { +else /* Resume RF Rx LPF corner */ /* After initialized, we can use pCoexDm->btRf0x1eBackup */ -if (pBtCoexist->bInitilized) { +if (pBtCoexist->bInitilized) pBtCoexist->fBtcSetRfReg (pBtCoexist,BTC_RF_A ,0x1e ,0xfffff , pCoexDm->btRf0x1eBackup); - } - } } static void halbtc8723b2ant_RfShrink(
@@ -504,7 +485,7 @@ static void halbtc8723b2ant_SetSwPenaltyTxRateAdaptive( struct btc_coexist *pBtCoexist, bool bLowPenaltyRa ) { -u8 H2C_Parameter[6 ] = {0 }; +u8 H2C_Parameter[6 ] = {0 }; H2C_Parameter[0 ] =0x6 ;/* opCode, 0x6 = Retry_Penalty */
@@ -743,7 +724,7 @@ static void halbtc8723b2ant_SetFwIgnoreWlanAct( struct btc_coexist *pBtCoexist, bool bEnable ) { -u8 H2C_Parameter[1 ] = {0 }; +u8 H2C_Parameter[1 ] = {0 };if (bEnable) H2C_Parameter[0 ] |=BIT (0 );/* function enable */
@@ -775,7 +756,7 @@ static void halbtc8723b2ant_SetFwPstdma(u8 byte5 ) { -u8 H2C_Parameter[5 ] = {0 }; +u8 H2C_Parameter[5 ] = {0 }; H2C_Parameter[0 ] = byte1; H2C_Parameter[1 ] = byte2;
@@ -824,7 +805,7 @@ static void halbtc8723b2ant_SetAntPath(u32 fwVer =0 , u4Tmp =0 ;bool bPgExtSwitch = false;bool bUseExtSwitch = false; -u8 H2C_Parameter[2 ] = {0 }; +u8 H2C_Parameter[2 ] = {0 }; pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_BL_EXT_SWITCH , &bPgExtSwitch); pBtCoexist->fBtcGet (pBtCoexist,BTC_GET_U4_WIFI_FW_VER , &fwVer);/* [31:16]=fw ver, [15:0]=fw sub ver */
@@ -2197,13 +2178,11 @@ static void halbtc8723b2ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist) {u8 algorithm =0 ; -if (pBtCoexist->bManualControl) { +if (pBtCoexist->bManualControl)return ; - } -if (pCoexSta->bUnderIps) { +if (pCoexSta->bUnderIps)return ; - } algorithm =halbtc8723b2ant_ActionAlgorithm (pBtCoexist);if (pCoexSta->bC2hBtInquiryPage && (algorithm !=BT_8723B_2ANT_COEX_ALGO_PANHS )) {
@@ -2221,9 +2200,8 @@ static void halbtc8723b2ant_RunCoexistMechanism(struct btc_coexist *pBtCoexist)if (halbtc8723b2ant_IsCommonAction (pBtCoexist)) { pCoexDm->bAutoTdmaAdjust = false; }else { -if (pCoexDm->curAlgorithm != pCoexDm->preAlgorithm) { +if (pCoexDm->curAlgorithm != pCoexDm->preAlgorithm) pCoexDm->bAutoTdmaAdjust = false; - }switch (pCoexDm->curAlgorithm) {case BT_8723B_2ANT_COEX_ALGO_SCO :
Signature · 1 line
2.55.0