* [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
@ 2026-03-11 23:30 Oskar Ray-Frayssinet
0 siblings, 0 replies; 5+ messages in thread
From: Oskar Ray-Frayssinet @ 2026-03-11 23:30 UTC (permalink / raw)
To: gregkh; +Cc: straube.linux, linux-staging, linux-kernel, Oskar Ray-Frayssinet
Remove unnecessary braces around single statement blocks throughout
the rtl8723bs driver to comply with kernel coding style.
Signed-off-by: Oskar Ray-Frayssinet <rayfraytech@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +-
.../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 108 +++++++-----------
drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +-
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 ++--
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +-
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 6 +-
drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +-
drivers/staging/rtl8723bs/hal/odm.c | 3 +-
drivers/staging/rtl8723bs/hal/odm_DIG.c | 28 ++---
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +-
.../rtl8723bs/hal/odm_RegConfig8723B.c | 6 +-
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +-
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 42 +++----
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +-
15 files changed, 96 insertions(+), 162 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 337671b1211f..10eee7bcfe12 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f
}
- if (ret == _FAIL) {
+ if (ret == _FAIL)
goto exit;
- } else if (ret == RTW_RX_HANDLED) {
+ else if (ret == RTW_RX_HANDLED)
goto exit;
- }
if (!psta) {
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
index d32dbf94858f..0baa515a7067 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
@@ -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;
- }
}
}
@@ -294,9 +282,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_HS_OPERATION, &bBtHsOn);
- if (!pBtLinkInfo->bBtLinkExist) {
+ if (!pBtLinkInfo->bBtLinkExist)
return algorithm;
- }
if (pBtLinkInfo->bScoExist)
numOfDiffProfile++;
@@ -319,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) {
@@ -333,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 (
@@ -349,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) {
@@ -389,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) {
@@ -480,9 +462,8 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner(
} 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);
- }
}
}
@@ -2202,13 +2183,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 && (BT_8723B_2ANT_COEX_ALGO_PANHS != algorithm)) {
@@ -2226,9 +2205,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) {
@@ -2406,11 +2384,10 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)
{
- if (type == BTC_LPS_ENABLE) {
+ if (type == BTC_LPS_ENABLE)
pCoexSta->bUnderLps = true;
- } else if (type == BTC_LPS_DISABLE) {
+ else if (type == BTC_LPS_DISABLE)
pCoexSta->bUnderLps = false;
- }
}
void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
@@ -2486,9 +2463,8 @@ void EXhalbtc8723b2ant_BtInfoNotify(
}
- if (pBtCoexist->bManualControl) {
+ if (pBtCoexist->bManualControl)
return;
- }
if (BT_INFO_SRC_8723B_2ANT_WIFI_FW != rspSource) {
pCoexSta->btRetryCnt = pCoexSta->btInfoC2h[rspSource][2] & 0xf; /* [3:0] */
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
index 7bef05a9a063..5d2562dae16a 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
@@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
}
/* Calculate Average ThermalValue after average enough times */
- if (ThermalValue_AVG_count) {
+ if (ThermalValue_AVG_count)
ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count);
- }
/* 4 5. Calculate delta, delta_LCK */
/* delta" here is used to determine whether thermal value changes or not. */
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 9df3274c1048..b96761321d0f 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -1120,9 +1120,8 @@ static void _PHY_SaveADDARegisters8723B(
if (!ODM_CheckPowerStatus(padapter))
return;
- for (i = 0 ; i < RegisterNum ; i++) {
+ for (i = 0 ; i < RegisterNum ; i++)
ADDABackup[i] = PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord);
- }
}
@@ -1134,9 +1133,8 @@ static void _PHY_SaveMACRegisters8723B(
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
- for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
MACBackup[i] = rtw_read8(pDM_Odm->Adapter, MACReg[i]);
- }
MACBackup[i] = rtw_read32(pDM_Odm->Adapter, MACReg[i]);
}
@@ -1153,9 +1151,8 @@ static void _PHY_ReloadADDARegisters8723B(
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
- for (i = 0 ; i < RegiesterNum; i++) {
+ for (i = 0 ; i < RegiesterNum; i++)
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]);
- }
}
static void _PHY_ReloadMACRegisters8723B(
@@ -1164,9 +1161,8 @@ static void _PHY_ReloadMACRegisters8723B(
{
u32 i;
- for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]);
- }
rtw_write32(padapter, MACReg[i], MACBackup[i]);
}
@@ -1190,9 +1186,8 @@ static void _PHY_PathADDAOn8723B(
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn);
}
- for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++) {
+ for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++)
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn);
- }
}
@@ -1206,9 +1201,8 @@ static void _PHY_MACSettingCalibration8723B(
rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F);
- for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++)
rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3)));
- }
rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5)));
}
@@ -1538,9 +1532,8 @@ static void phy_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm, bool is2T)
PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0); /* LDO OFF */
/* Channel 10 LC calibration issue for 8723bs with 26M xtal */
- if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2) {
+ if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2)
PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal);
- }
/* Restore original situation */
if ((tmpReg&0x70) != 0) { /* Deal with contisuous TX case */
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 9105594d2dde..77f02c160cb5 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy
if (pBtCoexist->bManualControl)
return;
- if (pktType == PACKET_DHCP) {
+ if (pktType == PACKET_DHCP)
packetType = BTC_PACKET_DHCP;
- } else if (pktType == PACKET_EAPOL) {
+ else if (pktType == PACKET_EAPOL)
packetType = BTC_PACKET_EAPOL;
- } else if (pktType == PACKET_ARP) {
+ else if (pktType == PACKET_ARP)
packetType = BTC_PACKET_ARP;
- } else {
+ else
return;
- }
/* All notify is called in cmd thread, don't need to leave low power again */
/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index dc2da49e6738..736d99d6cd4b 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -323,9 +323,8 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *padapter, u32 RfPath,
if (RfPath >= RF_PATH_MAX)
return;
- for (i = 0; i < rateNum; ++i) {
+ for (i = 0; i < rateNum; ++i)
pHalData->TxPwrByRateOffset[RfPath][rateIndex[i]] = PwrByRateVal[i];
- }
}
static void PHY_StoreTxPowerByRateOld(
@@ -361,9 +360,8 @@ void PHY_StoreTxPowerByRate(
if (pDM_Odm->PhyRegPgVersion > 0)
PHY_StoreTxPowerByRateNew(padapter, RfPath, RegAddr, BitMask, Data);
- else if (pDM_Odm->PhyRegPgVersion == 0) {
+ else if (pDM_Odm->PhyRegPgVersion == 0)
PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data);
- }
}
static void
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 27c0c0198714..45634b5e5082 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -208,9 +208,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
add_ratid(padapter, psta, rssi_level);
- else {
+ else
UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level);
- }
}
void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rssi_level)
@@ -254,9 +253,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)
void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
{
- if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) {
+ if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode)
rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in interrupt context */
- }
}
void beacon_timing_control(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 639b6da2302b..2838381bff0e 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -270,9 +270,8 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id == 1) */
continue;
- if (true == ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {
+ if (true == ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level))
rtw_hal_update_ra_mask(pstat, pstat->rssi_level);
- }
}
}
diff --git a/drivers/staging/rtl8723bs/hal/odm_DIG.c b/drivers/staging/rtl8723bs/hal/odm_DIG.c
index f10427abd849..33661182d85a 100644
--- a/drivers/staging/rtl8723bs/hal/odm_DIG.c
+++ b/drivers/staging/rtl8723bs/hal/odm_DIG.c
@@ -220,9 +220,8 @@ void odm_Adaptivity(void *pDM_VOID, u8 IGI)
s8 Diff, IGI_target;
bool EDCCA_State = false;
- if (!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY)) {
+ if (!(pDM_Odm->SupportAbility & ODM_BB_ADAPTIVITY))
return;
- }
if (*pDM_Odm->pBandWidth == ODM_BW20M) /* CHANNEL_WIDTH_20 */
IGI_target = pDM_Odm->IGI_Base;
@@ -286,16 +285,14 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)
struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;
struct dig_t *pDM_DigTable = &pDM_Odm->DM_DigTable;
- if (pDM_DigTable->bStopDIG) {
+ if (pDM_DigTable->bStopDIG)
return;
- }
if (pDM_DigTable->CurIGValue != CurrentIGI) {
/* 1 Check initial gain by upper bound */
if (!pDM_DigTable->bPSDInProgress) {
- if (CurrentIGI > pDM_DigTable->rx_gain_range_max) {
+ if (CurrentIGI > pDM_DigTable->rx_gain_range_max)
CurrentIGI = pDM_DigTable->rx_gain_range_max;
- }
}
@@ -314,24 +311,20 @@ bool odm_DigAbort(void *pDM_VOID)
struct dm_odm_t *pDM_Odm = (struct dm_odm_t *)pDM_VOID;
/* SupportAbility */
- if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT)) {
+ if (!(pDM_Odm->SupportAbility & ODM_BB_FA_CNT))
return true;
- }
/* SupportAbility */
- if (!(pDM_Odm->SupportAbility & ODM_BB_DIG)) {
+ if (!(pDM_Odm->SupportAbility & ODM_BB_DIG))
return true;
- }
/* ScanInProcess */
- if (*(pDM_Odm->pbScanInProcess)) {
+ if (*(pDM_Odm->pbScanInProcess))
return true;
- }
/* add by Neil Chen to avoid PSD is processing */
- if (pDM_Odm->bDMInitialGainEnable == false) {
+ if (pDM_Odm->bDMInitialGainEnable == false)
return true;
- }
return false;
}
@@ -413,9 +406,9 @@ void odm_DIG(void *pDM_VOID)
if (pDM_Odm->bLinked && bPerformance) {
/* 2 Modify DIG upper bound */
/* 4 Modify DIG upper bound for 92E, 8723A\B, 8821 & 8812 BT */
- if (pDM_Odm->bBtLimitedDig == 1) {
+ if (pDM_Odm->bBtLimitedDig == 1)
offset = 10;
- } else
+ else
offset = 15;
if ((pDM_Odm->RSSI_Min + offset) > dm_dig_max)
@@ -475,9 +468,8 @@ void odm_DIG(void *pDM_VOID)
}
/* 2 Abnormal lower bound case */
- if (pDM_DigTable->rx_gain_range_min > pDM_DigTable->rx_gain_range_max) {
+ if (pDM_DigTable->rx_gain_range_min > pDM_DigTable->rx_gain_range_max)
pDM_DigTable->rx_gain_range_min = pDM_DigTable->rx_gain_range_max;
- }
/* 1 False alarm threshold decision */
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 994b8c578e7a..1e67e27994c7 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -240,9 +240,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
if (is_cck_rate) {
phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, pwdb_all));
} else {
- if (rf_rx_num != 0) {
+ if (rf_rx_num != 0)
phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, total_rssi /= rf_rx_num));
- }
}
}
diff --git a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
index 1df42069bd5c..b0ca46aec1a5 100644
--- a/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
+++ b/drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c
@@ -125,9 +125,8 @@ void odm_ConfigBB_PHY_REG_PG_8723B(
{
if (Addr == 0xfe || Addr == 0xffe)
msleep(50);
- else {
+ else
PHY_StoreTxPowerByRate(pDM_Odm->Adapter, RfPath, Addr, Bitmask, Data);
- }
}
void odm_ConfigBB_PHY_8723B(
@@ -149,9 +148,8 @@ void odm_ConfigBB_PHY_8723B(
udelay(5);
else if (Addr == 0xf9)
udelay(1);
- else {
+ else
PHY_SetBBReg(pDM_Odm->Adapter, Addr, Bitmask, Data);
- }
/* Add 1us delay between BB/RF register setting. */
udelay(1);
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index af6cdda8238d..a44f5bd58306 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -25,9 +25,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
do {
valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
- if (0 == valid) {
+ if (0 == valid)
read_down = true;
- }
} while ((!read_down) && (retry_cnts--));
return read_down;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 8d259820f103..cfada1c375c9 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -197,9 +197,8 @@ static s32 polling_fwdl_chksum(
yield();
} while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt);
- if (!(value32 & FWDL_ChkSum_rpt)) {
+ if (!(value32 & FWDL_ChkSum_rpt))
goto exit;
- }
if (g_fwdl_chksum_fail) {
g_fwdl_chksum_fail--;
@@ -238,9 +237,8 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
yield();
} while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt);
- if (!(value32 & WINTINI_RDY)) {
+ if (!(value32 & WINTINI_RDY))
goto exit;
- }
if (g_fwdl_wintint_rdy_fail) {
g_fwdl_wintint_rdy_fail--;
@@ -1048,9 +1046,8 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
rate_bitmap = hal_btcoex_GetRaMask(padapter);
mask &= ~rate_bitmap;
- if (pHalData->fw_ractrl) {
+ if (pHalData->fw_ractrl)
rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mode, short_gi_rate, mask);
- }
/* set correct initial date rate for each mac_id */
pdmpriv->INIDATA_RATE[mac_id] = psta->init_rate;
@@ -1203,9 +1200,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)
/* Check 0x8129 again for making sure autoload status!! */
EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
- if (EEPROMId != RTL_EEPROM_ID) {
+ if (EEPROMId != RTL_EEPROM_ID)
pEEPROM->bautoload_fail_flag = true;
- } else
+ else
pEEPROM->bautoload_fail_flag = false;
}
@@ -1590,13 +1587,12 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
if (pattrib->bwmode == CHANNEL_WIDTH_40) {
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
} else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
- if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) {
+ if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
SCSettingOfDesc = HT_DATA_SC_20_UPPER_OF_40MHZ;
- } else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) {
+ else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
SCSettingOfDesc = HT_DATA_SC_20_LOWER_OF_40MHZ;
- } else {
+ else
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
- }
}
} else {
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
@@ -1621,9 +1617,8 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc *ptxdesc)
/* Thomas, Lucas@SD4, 20130515 */
count = 16;
- for (index = 0; index < count; index++) {
+ for (index = 0; index < count; index++)
checksum |= le16_to_cpu(*(__le16 *)(usPtr + index));
- }
ptxdesc->txdw7 |= cpu_to_le32(checksum & 0x0000ffff);
}
@@ -1796,11 +1791,10 @@ static void rtl8723b_fill_default_txdesc(
ptxdesc->mbssid = pattrib->mbssid & 0xF;
ptxdesc->rty_lmt_en = 1; /* retry limit enable */
- if (pattrib->retry_ctrl) {
+ if (pattrib->retry_ctrl)
ptxdesc->data_rt_lmt = 6;
- } else {
+ else
ptxdesc->data_rt_lmt = 12;
- }
ptxdesc->datarate = MRateToHwRate(pmlmeext->tx_rate);
@@ -1891,9 +1885,8 @@ void rtl8723b_fill_fake_txdesc(
SET_TX_DESC_HWSEQ_SEL_8723B(pDesc, 0);
}
- if (IsBTQosNull) {
+ if (IsBTQosNull)
SET_TX_DESC_BT_INT_8723B(pDesc, 1);
- }
SET_TX_DESC_USE_RATE_8723B(pDesc, 1); /* use data rate which is set by Sw */
SET_TX_DESC_OWN_8723B((u8 *)pDesc, 1);
@@ -2209,9 +2202,8 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len)
#define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 6, 1)
#define GET_8723B_C2H_TX_RPT_RETRY_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 7, 1)
- if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata)) {
+ if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata))
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
- }
/*
else if (seq_no != padapter->xmitpriv.seq_no) {
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
@@ -2578,9 +2570,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
/* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */
/* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */
- if (psmode != PS_MODE_ACTIVE) {
+ if (psmode != PS_MODE_ACTIVE)
ODM_RF_Saving(&pHalData->odmpriv, true);
- }
/* if (psmode != PS_MODE_ACTIVE) { */
/* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */
@@ -2894,11 +2885,10 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
break;
case HAL_DEF_TX_PAGE_BOUNDARY:
- if (!padapter->registrypriv.wifi_spec) {
+ if (!padapter->registrypriv.wifi_spec)
*(u8 *)pval = TX_PAGE_BOUNDARY_8723B;
- } else {
+ else
*(u8 *)pval = WMM_NORMAL_TX_PAGE_BOUNDARY_8723B;
- }
break;
case HAL_DEF_MACID_SLEEP:
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index a1f2cbf2cf55..e4ab0502458f 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -140,9 +140,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
return _SUCCESS;
ret = rtw_register_tx_alive(padapter);
- if (ret != _SUCCESS) {
+ if (ret != _SUCCESS)
return _SUCCESS;
- }
do {
queue_empty = rtl8723_dequeue_writeport(padapter);
@@ -373,9 +372,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 0) {
+ if (ret == 0)
return _SUCCESS;
- }
/* dequeue frame and write to hardware */
@@ -393,9 +391,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 1) {
+ if (ret == 1)
goto next;
- }
return _SUCCESS;
}
@@ -410,9 +407,8 @@ int rtl8723bs_xmit_thread(void *context)
do {
ret = rtl8723bs_xmit_handler(padapter);
- if (signal_pending(current)) {
+ if (signal_pending(current))
flush_signals(current);
- }
} while (_SUCCESS == ret);
complete(&pxmitpriv->SdioXmitTerminate);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d664e254912c..a86252ccac76 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -146,9 +146,8 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
sdio_claim_host(func);
sdio_disable_func(func);
- if (dvobj->irq_alloc) {
+ if (dvobj->irq_alloc)
sdio_release_irq(func);
- }
sdio_release_host(func);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
@ 2026-03-17 20:37 Oskar Ray-Frayssinet
2026-03-18 13:04 ` kernel test robot
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Oskar Ray-Frayssinet @ 2026-03-17 20:37 UTC (permalink / raw)
To: gregkh; +Cc: straube.linux, linux-staging, linux-kernel, Oskar Ray-Frayssinet
Remove unnecessary braces around single statement blocks throughout
the rtl8723bs driver to comply with kernel coding style.
Signed-off-by: Oskar Ray-Frayssinet <rayfraytech@gmail.com>
---
drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +-
.../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 112 +++++++-----------
drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +-
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 ++--
drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +-
.../staging/rtl8723bs/hal/hal_com_phycfg.c | 6 +-
drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +-
drivers/staging/rtl8723bs/hal/odm.c | 4 +-
drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +-
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +-
.../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 42 +++----
.../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +-
drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +-
13 files changed, 86 insertions(+), 143 deletions(-)
diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
index 1a52d3e1d285..5aa2f7e1b54a 100644
--- a/drivers/staging/rtl8723bs/core/rtw_recv.c
+++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
@@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f
}
- if (ret == _FAIL) {
+ if (ret == _FAIL)
goto exit;
- } else if (ret == RTW_RX_HANDLED) {
+ else if (ret == RTW_RX_HANDLED)
goto exit;
- }
if (!psta) {
diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
index d32dbf94858f..c1ec8e3ddd61 100644
--- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
+++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
@@ -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;
- }
}
}
@@ -294,9 +282,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_HS_OPERATION, &bBtHsOn);
- if (!pBtLinkInfo->bBtLinkExist) {
+ if (!pBtLinkInfo->bBtLinkExist)
return algorithm;
- }
if (pBtLinkInfo->bScoExist)
numOfDiffProfile++;
@@ -319,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) {
@@ -333,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 (
@@ -349,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) {
@@ -389,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) {
@@ -403,10 +385,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
pBtLinkInfo->bPanExist &&
pBtLinkInfo->bA2dpExist
) {
- if (bBtHsOn) {
- } else {
+ if (bBtHsOn)
algorithm = BT_8723B_2ANT_COEX_ALGO_PANEDR_HID;
- }
}
}
}
@@ -480,9 +460,8 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner(
} 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);
- }
}
}
@@ -2202,13 +2181,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 && (BT_8723B_2ANT_COEX_ALGO_PANHS != algorithm)) {
@@ -2226,9 +2203,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) {
@@ -2406,11 +2382,10 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)
{
- if (type == BTC_LPS_ENABLE) {
+ if (type == BTC_LPS_ENABLE)
pCoexSta->bUnderLps = true;
- } else if (type == BTC_LPS_DISABLE) {
+ else if (type == BTC_LPS_DISABLE)
pCoexSta->bUnderLps = false;
- }
}
void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
@@ -2486,9 +2461,8 @@ void EXhalbtc8723b2ant_BtInfoNotify(
}
- if (pBtCoexist->bManualControl) {
+ if (pBtCoexist->bManualControl)
return;
- }
if (BT_INFO_SRC_8723B_2ANT_WIFI_FW != rspSource) {
pCoexSta->btRetryCnt = pCoexSta->btInfoC2h[rspSource][2] & 0xf; /* [3:0] */
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
index 7bef05a9a063..5d2562dae16a 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
@@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
}
/* Calculate Average ThermalValue after average enough times */
- if (ThermalValue_AVG_count) {
+ if (ThermalValue_AVG_count)
ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count);
- }
/* 4 5. Calculate delta, delta_LCK */
/* delta" here is used to determine whether thermal value changes or not. */
diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
index 8f6849f2277e..50e81a67138b 100644
--- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
+++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
@@ -1108,9 +1108,8 @@ static void _PHY_SaveADDARegisters8723B(
if (!ODM_CheckPowerStatus(padapter))
return;
- for (i = 0 ; i < RegisterNum ; i++) {
+ for (i = 0 ; i < RegisterNum ; i++)
ADDABackup[i] = PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord);
- }
}
@@ -1122,9 +1121,8 @@ static void _PHY_SaveMACRegisters8723B(
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
- for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
MACBackup[i] = rtw_read8(pDM_Odm->Adapter, MACReg[i]);
- }
MACBackup[i] = rtw_read32(pDM_Odm->Adapter, MACReg[i]);
}
@@ -1141,9 +1139,8 @@ static void _PHY_ReloadADDARegisters8723B(
struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
- for (i = 0 ; i < RegiesterNum; i++) {
+ for (i = 0 ; i < RegiesterNum; i++)
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]);
- }
}
static void _PHY_ReloadMACRegisters8723B(
@@ -1152,9 +1149,8 @@ static void _PHY_ReloadMACRegisters8723B(
{
u32 i;
- for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]);
- }
rtw_write32(padapter, MACReg[i], MACBackup[i]);
}
@@ -1178,9 +1174,8 @@ static void _PHY_PathADDAOn8723B(
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn);
}
- for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++) {
+ for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++)
PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn);
- }
}
@@ -1194,9 +1189,8 @@ static void _PHY_MACSettingCalibration8723B(
rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F);
- for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++) {
+ for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++)
rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3)));
- }
rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5)));
}
@@ -1528,9 +1522,8 @@ static void phy_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm, bool is2T)
PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0); /* LDO OFF */
/* Channel 10 LC calibration issue for 8723bs with 26M xtal */
- if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2) {
+ if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2)
PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal);
- }
/* Restore original situation */
if ((tmpReg&0x70) != 0) { /* Deal with contisuous TX case */
diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
index 9c84f4cf1dda..012ddbae68a1 100644
--- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
+++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
@@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy
if (pBtCoexist->bManualControl)
return;
- if (pktType == PACKET_DHCP) {
+ if (pktType == PACKET_DHCP)
packetType = BTC_PACKET_DHCP;
- } else if (pktType == PACKET_EAPOL) {
+ else if (pktType == PACKET_EAPOL)
packetType = BTC_PACKET_EAPOL;
- } else if (pktType == PACKET_ARP) {
+ else if (pktType == PACKET_ARP)
packetType = BTC_PACKET_ARP;
- } else {
+ else
return;
- }
/* All notify is called in cmd thread, don't need to leave low power again */
/* halbtcoutsrc_LeaveLowPower(pBtCoexist); */
diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
index dc2da49e6738..736d99d6cd4b 100644
--- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
+++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
@@ -323,9 +323,8 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *padapter, u32 RfPath,
if (RfPath >= RF_PATH_MAX)
return;
- for (i = 0; i < rateNum; ++i) {
+ for (i = 0; i < rateNum; ++i)
pHalData->TxPwrByRateOffset[RfPath][rateIndex[i]] = PwrByRateVal[i];
- }
}
static void PHY_StoreTxPowerByRateOld(
@@ -361,9 +360,8 @@ void PHY_StoreTxPowerByRate(
if (pDM_Odm->PhyRegPgVersion > 0)
PHY_StoreTxPowerByRateNew(padapter, RfPath, RegAddr, BitMask, Data);
- else if (pDM_Odm->PhyRegPgVersion == 0) {
+ else if (pDM_Odm->PhyRegPgVersion == 0)
PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data);
- }
}
static void
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 27c0c0198714..45634b5e5082 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -208,9 +208,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
add_ratid(padapter, psta, rssi_level);
- else {
+ else
UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level);
- }
}
void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rssi_level)
@@ -254,9 +253,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)
void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
{
- if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) {
+ if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode)
rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in interrupt context */
- }
}
void beacon_timing_control(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
index 639b6da2302b..859c816911e2 100644
--- a/drivers/staging/rtl8723bs/hal/odm.c
+++ b/drivers/staging/rtl8723bs/hal/odm.c
@@ -270,9 +270,9 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id == 1) */
continue;
- if (true == ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {
+ if (ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB,
+ false, &pstat->rssi_level))
rtw_hal_update_ra_mask(pstat, pstat->rssi_level);
- }
}
}
diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
index 994b8c578e7a..1e67e27994c7 100644
--- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
+++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
@@ -240,9 +240,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
if (is_cck_rate) {
phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, pwdb_all));
} else {
- if (rf_rx_num != 0) {
+ if (rf_rx_num != 0)
phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, total_rssi /= rf_rx_num));
- }
}
}
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
index af6cdda8238d..f4b2854bada7 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
@@ -25,9 +25,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
do {
valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
- if (0 == valid) {
+ if (valid == 0)
read_down = true;
- }
} while ((!read_down) && (retry_cnts--));
return read_down;
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 513d0c346c5e..87817bef180e 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -197,9 +197,8 @@ static s32 polling_fwdl_chksum(
yield();
} while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt);
- if (!(value32 & FWDL_ChkSum_rpt)) {
+ if (!(value32 & FWDL_ChkSum_rpt))
goto exit;
- }
if (g_fwdl_chksum_fail) {
g_fwdl_chksum_fail--;
@@ -238,9 +237,8 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
yield();
} while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt);
- if (!(value32 & WINTINI_RDY)) {
+ if (!(value32 & WINTINI_RDY))
goto exit;
- }
if (g_fwdl_wintint_rdy_fail) {
g_fwdl_wintint_rdy_fail--;
@@ -1048,9 +1046,8 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
rate_bitmap = hal_btcoex_GetRaMask(padapter);
mask &= ~rate_bitmap;
- if (pHalData->fw_ractrl) {
+ if (pHalData->fw_ractrl)
rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mode, short_gi_rate, mask);
- }
/* set correct initial date rate for each mac_id */
pdmpriv->INIDATA_RATE[mac_id] = psta->init_rate;
@@ -1203,9 +1200,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)
/* Check 0x8129 again for making sure autoload status!! */
EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
- if (EEPROMId != RTL_EEPROM_ID) {
+ if (EEPROMId != RTL_EEPROM_ID)
pEEPROM->bautoload_fail_flag = true;
- } else
+ else
pEEPROM->bautoload_fail_flag = false;
}
@@ -1590,13 +1587,12 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
if (pattrib->bwmode == CHANNEL_WIDTH_40) {
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
} else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
- if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) {
+ if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
SCSettingOfDesc = HT_DATA_SC_20_UPPER_OF_40MHZ;
- } else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) {
+ else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
SCSettingOfDesc = HT_DATA_SC_20_LOWER_OF_40MHZ;
- } else {
+ else
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
- }
}
} else {
SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
@@ -1621,9 +1617,8 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc *ptxdesc)
/* Thomas, Lucas@SD4, 20130515 */
count = 16;
- for (index = 0; index < count; index++) {
+ for (index = 0; index < count; index++)
checksum |= le16_to_cpu(*(__le16 *)(usPtr + index));
- }
ptxdesc->txdw7 |= cpu_to_le32(checksum & 0x0000ffff);
}
@@ -1796,11 +1791,10 @@ static void rtl8723b_fill_default_txdesc(
ptxdesc->mbssid = pattrib->mbssid & 0xF;
ptxdesc->rty_lmt_en = 1; /* retry limit enable */
- if (pattrib->retry_ctrl) {
+ if (pattrib->retry_ctrl)
ptxdesc->data_rt_lmt = 6;
- } else {
+ else
ptxdesc->data_rt_lmt = 12;
- }
ptxdesc->datarate = MRateToHwRate(pmlmeext->tx_rate);
@@ -1891,9 +1885,8 @@ void rtl8723b_fill_fake_txdesc(
SET_TX_DESC_HWSEQ_SEL_8723B(pDesc, 0);
}
- if (IsBTQosNull) {
+ if (IsBTQosNull)
SET_TX_DESC_BT_INT_8723B(pDesc, 1);
- }
SET_TX_DESC_USE_RATE_8723B(pDesc, 1); /* use data rate which is set by Sw */
SET_TX_DESC_OWN_8723B((u8 *)pDesc, 1);
@@ -2209,9 +2202,8 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len)
#define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 6, 1)
#define GET_8723B_C2H_TX_RPT_RETRY_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 7, 1)
- if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata)) {
+ if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata))
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
- }
/*
else if (seq_no != padapter->xmitpriv.seq_no) {
rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
@@ -2578,9 +2570,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
/* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */
/* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */
- if (psmode != PS_MODE_ACTIVE) {
+ if (psmode != PS_MODE_ACTIVE)
ODM_RF_Saving(&pHalData->odmpriv, true);
- }
/* if (psmode != PS_MODE_ACTIVE) { */
/* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */
@@ -2894,11 +2885,10 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
break;
case HAL_DEF_TX_PAGE_BOUNDARY:
- if (!padapter->registrypriv.wifi_spec) {
+ if (!padapter->registrypriv.wifi_spec)
*(u8 *)pval = TX_PAGE_BOUNDARY_8723B;
- } else {
+ else
*(u8 *)pval = WMM_NORMAL_TX_PAGE_BOUNDARY_8723B;
- }
break;
case HAL_DEF_MACID_SLEEP:
diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index 379d29d3f9d3..f31884a0dfc1 100644
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -140,9 +140,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
return _SUCCESS;
ret = rtw_register_tx_alive(padapter);
- if (ret != _SUCCESS) {
+ if (ret != _SUCCESS)
return _SUCCESS;
- }
do {
queue_empty = rtl8723_dequeue_writeport(padapter);
@@ -373,9 +372,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 0) {
+ if (ret == 0)
return _SUCCESS;
- }
/* dequeue frame and write to hardware */
@@ -393,9 +391,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
spin_lock_bh(&pxmitpriv->lock);
ret = rtw_txframes_pending(padapter);
spin_unlock_bh(&pxmitpriv->lock);
- if (ret == 1) {
+ if (ret == 1)
goto next;
- }
return _SUCCESS;
}
@@ -410,9 +407,8 @@ int rtl8723bs_xmit_thread(void *context)
do {
ret = rtl8723bs_xmit_handler(padapter);
- if (signal_pending(current)) {
+ if (signal_pending(current))
flush_signals(current);
- }
} while (_SUCCESS == ret);
complete(&pxmitpriv->SdioXmitTerminate);
diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
index d664e254912c..a86252ccac76 100644
--- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
+++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
@@ -146,9 +146,8 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
sdio_claim_host(func);
sdio_disable_func(func);
- if (dvobj->irq_alloc) {
+ if (dvobj->irq_alloc)
sdio_release_irq(func);
- }
sdio_release_host(func);
}
--
2.43.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
2026-03-17 20:37 [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks Oskar Ray-Frayssinet
@ 2026-03-18 13:04 ` kernel test robot
2026-03-18 13:48 ` kernel test robot
2026-03-18 15:57 ` Greg KH
2 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-03-18 13:04 UTC (permalink / raw)
To: Oskar Ray-Frayssinet, gregkh
Cc: oe-kbuild-all, straube.linux, linux-staging, linux-kernel,
Oskar Ray-Frayssinet
Hi Oskar,
kernel test robot noticed the following build errors:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Oskar-Ray-Frayssinet/staging-rtl8723bs-remove-unnecessary-braces-in-single-statement-blocks/20260318-121311
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20260317203715.7430-1-rayfraytech%40gmail.com
patch subject: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
config: nios2-allmodconfig (https://download.01.org/0day-ci/archive/20260318/202603182051.NuXiZYrt-lkp@intel.com/config)
compiler: nios2-linux-gcc (GCC) 11.5.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260318/202603182051.NuXiZYrt-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603182051.NuXiZYrt-lkp@intel.com/
All errors (new ones prefixed by >>):
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c: In function 'halbtc8723b2ant_WifiRssiState':
>> drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:131:25: error: expected '}' before 'else'
131 | else
| ^~~~
vim +131 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
82
83 static u8 halbtc8723b2ant_WifiRssiState(
84 struct btc_coexist *pBtCoexist,
85 u8 index,
86 u8 levelNum,
87 u8 rssiThresh,
88 u8 rssiThresh1
89 )
90 {
91 s32 wifiRssi = 0;
92 u8 wifiRssiState = pCoexSta->preWifiRssiState[index];
93
94 pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_S4_WIFI_RSSI, &wifiRssi);
95
96 if (levelNum == 2) {
97 if (
98 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_LOW) ||
99 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_LOW)
100 ) {
101 if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
102 wifiRssiState = BTC_RSSI_STATE_HIGH;
103 else
104 wifiRssiState = BTC_RSSI_STATE_STAY_LOW;
105 } else {
106 if (wifiRssi < rssiThresh)
107 wifiRssiState = BTC_RSSI_STATE_LOW;
108 else
109 wifiRssiState = BTC_RSSI_STATE_STAY_HIGH;
110 }
111 } else if (levelNum == 3) {
112 if (rssiThresh > rssiThresh1)
113 return pCoexSta->preWifiRssiState[index];
114
115 if (
116 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_LOW) ||
117 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_LOW)
118 ) {
119 if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
120 wifiRssiState = BTC_RSSI_STATE_MEDIUM;
121 else
122 wifiRssiState = BTC_RSSI_STATE_STAY_LOW;
123 } else if (
124 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_MEDIUM) ||
125 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_MEDIUM)
126 ) {
127 if (wifiRssi >= (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
128 wifiRssiState = BTC_RSSI_STATE_HIGH;
129 else if (wifiRssi < rssiThresh) {
130 wifiRssiState = BTC_RSSI_STATE_LOW;
> 131 else
132 wifiRssiState = BTC_RSSI_STATE_STAY_MEDIUM;
133 } else {
134 if (wifiRssi < rssiThresh1)
135 wifiRssiState = BTC_RSSI_STATE_MEDIUM;
136 else
137 wifiRssiState = BTC_RSSI_STATE_STAY_HIGH;
138 }
139 }
140
141 pCoexSta->preWifiRssiState[index] = wifiRssiState;
142
143 return wifiRssiState;
144 }
145
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
2026-03-17 20:37 [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks Oskar Ray-Frayssinet
2026-03-18 13:04 ` kernel test robot
@ 2026-03-18 13:48 ` kernel test robot
2026-03-18 15:57 ` Greg KH
2 siblings, 0 replies; 5+ messages in thread
From: kernel test robot @ 2026-03-18 13:48 UTC (permalink / raw)
To: Oskar Ray-Frayssinet, gregkh
Cc: llvm, oe-kbuild-all, straube.linux, linux-staging, linux-kernel,
Oskar Ray-Frayssinet
Hi Oskar,
kernel test robot noticed the following build errors:
[auto build test ERROR on staging/staging-testing]
url: https://github.com/intel-lab-lkp/linux/commits/Oskar-Ray-Frayssinet/staging-rtl8723bs-remove-unnecessary-braces-in-single-statement-blocks/20260318-121311
base: staging/staging-testing
patch link: https://lore.kernel.org/r/20260317203715.7430-1-rayfraytech%40gmail.com
patch subject: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
config: sparc64-allmodconfig (https://download.01.org/0day-ci/archive/20260318/202603182154.qP1dKSZf-lkp@intel.com/config)
compiler: clang version 23.0.0git (https://github.com/llvm/llvm-project 4abb927bacf37f18f6359a41639a6d1b3bffffb5)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20260318/202603182154.qP1dKSZf-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202603182154.qP1dKSZf-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:131:4: error: expected expression
131 | else
| ^
>> drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:153:1: error: function definition is not allowed here
153 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:171:1: error: function definition is not allowed here
171 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:182:1: error: function definition is not allowed here
182 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:213:1: error: function definition is not allowed here
213 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:277:1: error: function definition is not allowed here
277 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:400:1: error: function definition is not allowed here
400 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:413:1: error: function definition is not allowed here
413 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:424:1: error: function definition is not allowed here
424 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:439:1: error: function definition is not allowed here
439 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:456:1: error: function definition is not allowed here
456 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:471:1: error: function definition is not allowed here
471 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:486:1: error: function definition is not allowed here
486 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:505:1: error: function definition is not allowed here
505 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:519:1: error: function definition is not allowed here
519 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:528:1: error: function definition is not allowed here
528 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:542:1: error: function definition is not allowed here
542 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:561:1: error: function definition is not allowed here
561 | {
| ^
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c:615:1: error: function definition is not allowed here
615 | {
| ^
fatal error: too many errors emitted, stopping now [-ferror-limit=]
20 errors generated.
vim +131 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
82
83 static u8 halbtc8723b2ant_WifiRssiState(
84 struct btc_coexist *pBtCoexist,
85 u8 index,
86 u8 levelNum,
87 u8 rssiThresh,
88 u8 rssiThresh1
89 )
90 {
91 s32 wifiRssi = 0;
92 u8 wifiRssiState = pCoexSta->preWifiRssiState[index];
93
94 pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_S4_WIFI_RSSI, &wifiRssi);
95
96 if (levelNum == 2) {
97 if (
98 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_LOW) ||
99 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_LOW)
100 ) {
101 if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
102 wifiRssiState = BTC_RSSI_STATE_HIGH;
103 else
104 wifiRssiState = BTC_RSSI_STATE_STAY_LOW;
105 } else {
106 if (wifiRssi < rssiThresh)
107 wifiRssiState = BTC_RSSI_STATE_LOW;
108 else
109 wifiRssiState = BTC_RSSI_STATE_STAY_HIGH;
110 }
111 } else if (levelNum == 3) {
112 if (rssiThresh > rssiThresh1)
113 return pCoexSta->preWifiRssiState[index];
114
115 if (
116 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_LOW) ||
117 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_LOW)
118 ) {
119 if (wifiRssi >= (rssiThresh + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
120 wifiRssiState = BTC_RSSI_STATE_MEDIUM;
121 else
122 wifiRssiState = BTC_RSSI_STATE_STAY_LOW;
123 } else if (
124 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_MEDIUM) ||
125 (pCoexSta->preWifiRssiState[index] == BTC_RSSI_STATE_STAY_MEDIUM)
126 ) {
127 if (wifiRssi >= (rssiThresh1 + BTC_RSSI_COEX_THRESH_TOL_8723B_2ANT))
128 wifiRssiState = BTC_RSSI_STATE_HIGH;
129 else if (wifiRssi < rssiThresh) {
130 wifiRssiState = BTC_RSSI_STATE_LOW;
> 131 else
132 wifiRssiState = BTC_RSSI_STATE_STAY_MEDIUM;
133 } else {
134 if (wifiRssi < rssiThresh1)
135 wifiRssiState = BTC_RSSI_STATE_MEDIUM;
136 else
137 wifiRssiState = BTC_RSSI_STATE_STAY_HIGH;
138 }
139 }
140
141 pCoexSta->preWifiRssiState[index] = wifiRssiState;
142
143 return wifiRssiState;
144 }
145
146 static void halbtc8723b2ant_LimitedRx(
147 struct btc_coexist *pBtCoexist,
148 bool bForceExec,
149 bool bRejApAggPkt,
150 bool bBtCtrlAggBufSize,
151 u8 aggBufSize
152 )
> 153 {
154 bool bRejectRxAgg = bRejApAggPkt;
155 bool bBtCtrlRxAggSize = bBtCtrlAggBufSize;
156 u8 rxAggSize = aggBufSize;
157
158 /* */
159 /* Rx Aggregation related setting */
160 /* */
161 pBtCoexist->fBtcSet(pBtCoexist, BTC_SET_BL_TO_REJ_AP_AGG_PKT, &bRejectRxAgg);
162 /* decide BT control aggregation buf size or not */
163 pBtCoexist->fBtcSet(pBtCoexist, BTC_SET_BL_BT_CTRL_AGG_SIZE, &bBtCtrlRxAggSize);
164 /* aggregation buf size, only work when BT control Rx aggregation size. */
165 pBtCoexist->fBtcSet(pBtCoexist, BTC_SET_U1_AGG_BUF_SIZE, &rxAggSize);
166 /* real update aggregation setting */
167 pBtCoexist->fBtcSet(pBtCoexist, BTC_SET_ACT_AGGREGATE_CTRL, NULL);
168 }
169
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks
2026-03-17 20:37 [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks Oskar Ray-Frayssinet
2026-03-18 13:04 ` kernel test robot
2026-03-18 13:48 ` kernel test robot
@ 2026-03-18 15:57 ` Greg KH
2 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2026-03-18 15:57 UTC (permalink / raw)
To: Oskar Ray-Frayssinet; +Cc: straube.linux, linux-staging, linux-kernel
On Tue, Mar 17, 2026 at 09:37:15PM +0100, Oskar Ray-Frayssinet wrote:
> Remove unnecessary braces around single statement blocks throughout
> the rtl8723bs driver to comply with kernel coding style.
>
> Signed-off-by: Oskar Ray-Frayssinet <rayfraytech@gmail.com>
> ---
> drivers/staging/rtl8723bs/core/rtw_recv.c | 5 +-
> .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 112 +++++++-----------
> drivers/staging/rtl8723bs/hal/HalPhyRf.c | 3 +-
> .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 ++--
> drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +-
> .../staging/rtl8723bs/hal/hal_com_phycfg.c | 6 +-
> drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +-
> drivers/staging/rtl8723bs/hal/odm.c | 4 +-
> drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 3 +-
> drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +-
> .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 42 +++----
> .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +-
> drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +-
> 13 files changed, 86 insertions(+), 143 deletions(-)
>
> diff --git a/drivers/staging/rtl8723bs/core/rtw_recv.c b/drivers/staging/rtl8723bs/core/rtw_recv.c
> index 1a52d3e1d285..5aa2f7e1b54a 100644
> --- a/drivers/staging/rtl8723bs/core/rtw_recv.c
> +++ b/drivers/staging/rtl8723bs/core/rtw_recv.c
> @@ -1339,11 +1339,10 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_f
>
> }
>
> - if (ret == _FAIL) {
> + if (ret == _FAIL)
> goto exit;
> - } else if (ret == RTW_RX_HANDLED) {
> + else if (ret == RTW_RX_HANDLED)
> goto exit;
> - }
>
>
> if (!psta) {
> diff --git a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
> index d32dbf94858f..c1ec8e3ddd61 100644
> --- a/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
> +++ b/drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c
> @@ -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;
> - }
> }
> }
>
> @@ -294,9 +282,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
>
> pBtCoexist->fBtcGet(pBtCoexist, BTC_GET_BL_HS_OPERATION, &bBtHsOn);
>
> - if (!pBtLinkInfo->bBtLinkExist) {
> + if (!pBtLinkInfo->bBtLinkExist)
> return algorithm;
> - }
>
> if (pBtLinkInfo->bScoExist)
> numOfDiffProfile++;
> @@ -319,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) {
> @@ -333,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 (
> @@ -349,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) {
> @@ -389,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) {
> @@ -403,10 +385,8 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)
> pBtLinkInfo->bPanExist &&
> pBtLinkInfo->bA2dpExist
> ) {
> - if (bBtHsOn) {
> - } else {
> + if (bBtHsOn)
> algorithm = BT_8723B_2ANT_COEX_ALGO_PANEDR_HID;
> - }
> }
> }
> }
> @@ -480,9 +460,8 @@ static void halbtc8723b2ant_SetSwRfRxLpfCorner(
> } 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);
> - }
> }
> }
>
> @@ -2202,13 +2181,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 && (BT_8723B_2ANT_COEX_ALGO_PANHS != algorithm)) {
> @@ -2226,9 +2203,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) {
> @@ -2406,11 +2382,10 @@ void EXhalbtc8723b2ant_IpsNotify(struct btc_coexist *pBtCoexist, u8 type)
>
> void EXhalbtc8723b2ant_LpsNotify(struct btc_coexist *pBtCoexist, u8 type)
> {
> - if (type == BTC_LPS_ENABLE) {
> + if (type == BTC_LPS_ENABLE)
> pCoexSta->bUnderLps = true;
> - } else if (type == BTC_LPS_DISABLE) {
> + else if (type == BTC_LPS_DISABLE)
> pCoexSta->bUnderLps = false;
> - }
> }
>
> void EXhalbtc8723b2ant_ScanNotify(struct btc_coexist *pBtCoexist, u8 type)
> @@ -2486,9 +2461,8 @@ void EXhalbtc8723b2ant_BtInfoNotify(
>
> }
>
> - if (pBtCoexist->bManualControl) {
> + if (pBtCoexist->bManualControl)
> return;
> - }
>
> if (BT_INFO_SRC_8723B_2ANT_WIFI_FW != rspSource) {
> pCoexSta->btRetryCnt = pCoexSta->btInfoC2h[rspSource][2] & 0xf; /* [3:0] */
> diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf.c b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
> index 7bef05a9a063..5d2562dae16a 100644
> --- a/drivers/staging/rtl8723bs/hal/HalPhyRf.c
> +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf.c
> @@ -118,9 +118,8 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter)
> }
>
> /* Calculate Average ThermalValue after average enough times */
> - if (ThermalValue_AVG_count) {
> + if (ThermalValue_AVG_count)
> ThermalValue = (u8)(ThermalValue_AVG / ThermalValue_AVG_count);
> - }
>
> /* 4 5. Calculate delta, delta_LCK */
> /* delta" here is used to determine whether thermal value changes or not. */
> diff --git a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
> index 8f6849f2277e..50e81a67138b 100644
> --- a/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
> +++ b/drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c
> @@ -1108,9 +1108,8 @@ static void _PHY_SaveADDARegisters8723B(
> if (!ODM_CheckPowerStatus(padapter))
> return;
>
> - for (i = 0 ; i < RegisterNum ; i++) {
> + for (i = 0 ; i < RegisterNum ; i++)
> ADDABackup[i] = PHY_QueryBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord);
> - }
> }
>
>
> @@ -1122,9 +1121,8 @@ static void _PHY_SaveMACRegisters8723B(
> struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
> struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
>
> - for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
> + for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
> MACBackup[i] = rtw_read8(pDM_Odm->Adapter, MACReg[i]);
> - }
> MACBackup[i] = rtw_read32(pDM_Odm->Adapter, MACReg[i]);
>
> }
> @@ -1141,9 +1139,8 @@ static void _PHY_ReloadADDARegisters8723B(
> struct hal_com_data *pHalData = GET_HAL_DATA(padapter);
> struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
>
> - for (i = 0 ; i < RegiesterNum; i++) {
> + for (i = 0 ; i < RegiesterNum; i++)
> PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, ADDABackup[i]);
> - }
> }
>
> static void _PHY_ReloadMACRegisters8723B(
> @@ -1152,9 +1149,8 @@ static void _PHY_ReloadMACRegisters8723B(
> {
> u32 i;
>
> - for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++) {
> + for (i = 0 ; i < (IQK_MAC_REG_NUM - 1); i++)
> rtw_write8(padapter, MACReg[i], (u8)MACBackup[i]);
> - }
> rtw_write32(padapter, MACReg[i], MACBackup[i]);
> }
>
> @@ -1178,9 +1174,8 @@ static void _PHY_PathADDAOn8723B(
> PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[0], bMaskDWord, pathOn);
> }
>
> - for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++) {
> + for (i = 1 ; i < IQK_ADDA_REG_NUM ; i++)
> PHY_SetBBReg(pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn);
> - }
>
> }
>
> @@ -1194,9 +1189,8 @@ static void _PHY_MACSettingCalibration8723B(
>
> rtw_write8(pDM_Odm->Adapter, MACReg[i], 0x3F);
>
> - for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++) {
> + for (i = 1 ; i < (IQK_MAC_REG_NUM - 1); i++)
> rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT3)));
> - }
> rtw_write8(pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i]&(~BIT5)));
>
> }
> @@ -1528,9 +1522,8 @@ static void phy_LCCalibrate_8723B(struct dm_odm_t *pDM_Odm, bool is2T)
> PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, 0xB0, bRFRegOffsetMask, 0xDFFE0); /* LDO OFF */
>
> /* Channel 10 LC calibration issue for 8723bs with 26M xtal */
> - if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2) {
> + if (pDM_Odm->SupportInterface == ODM_ITRF_SDIO && pDM_Odm->PackageType >= 0x2)
> PHY_SetRFReg(pDM_Odm->Adapter, RF_PATH_A, RF_CHNLBW, bMask12Bits, LC_Cal);
> - }
>
> /* Restore original situation */
> if ((tmpReg&0x70) != 0) { /* Deal with contisuous TX case */
> diff --git a/drivers/staging/rtl8723bs/hal/hal_btcoex.c b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> index 9c84f4cf1dda..012ddbae68a1 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_btcoex.c
> @@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTy
> if (pBtCoexist->bManualControl)
> return;
>
> - if (pktType == PACKET_DHCP) {
> + if (pktType == PACKET_DHCP)
> packetType = BTC_PACKET_DHCP;
> - } else if (pktType == PACKET_EAPOL) {
> + else if (pktType == PACKET_EAPOL)
> packetType = BTC_PACKET_EAPOL;
> - } else if (pktType == PACKET_ARP) {
> + else if (pktType == PACKET_ARP)
> packetType = BTC_PACKET_ARP;
> - } else {
> + else
> return;
> - }
>
> /* All notify is called in cmd thread, don't need to leave low power again */
> /* halbtcoutsrc_LeaveLowPower(pBtCoexist); */
> diff --git a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> index dc2da49e6738..736d99d6cd4b 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_com_phycfg.c
> @@ -323,9 +323,8 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *padapter, u32 RfPath,
> if (RfPath >= RF_PATH_MAX)
> return;
>
> - for (i = 0; i < rateNum; ++i) {
> + for (i = 0; i < rateNum; ++i)
> pHalData->TxPwrByRateOffset[RfPath][rateIndex[i]] = PwrByRateVal[i];
> - }
> }
>
> static void PHY_StoreTxPowerByRateOld(
> @@ -361,9 +360,8 @@ void PHY_StoreTxPowerByRate(
>
> if (pDM_Odm->PhyRegPgVersion > 0)
> PHY_StoreTxPowerByRateNew(padapter, RfPath, RegAddr, BitMask, Data);
> - else if (pDM_Odm->PhyRegPgVersion == 0) {
> + else if (pDM_Odm->PhyRegPgVersion == 0)
> PHY_StoreTxPowerByRateOld(padapter, RegAddr, BitMask, Data);
> - }
> }
>
> static void
> diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
> index 27c0c0198714..45634b5e5082 100644
> --- a/drivers/staging/rtl8723bs/hal/hal_intf.c
> +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
> @@ -208,9 +208,8 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)
>
> if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
> add_ratid(padapter, psta, rssi_level);
> - else {
> + else
> UpdateHalRAMask8723B(padapter, psta->mac_id, rssi_level);
> - }
> }
>
> void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rssi_level)
> @@ -254,9 +253,8 @@ void rtw_hal_dm_watchdog(struct adapter *padapter)
>
> void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)
> {
> - if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode) {
> + if (adapter_to_pwrctl(padapter)->fw_current_in_ps_mode)
> rtl8723b_HalDmWatchDog_in_LPS(padapter); /* this function caller is in interrupt context */
> - }
> }
>
> void beacon_timing_control(struct adapter *padapter)
> diff --git a/drivers/staging/rtl8723bs/hal/odm.c b/drivers/staging/rtl8723bs/hal/odm.c
> index 639b6da2302b..859c816911e2 100644
> --- a/drivers/staging/rtl8723bs/hal/odm.c
> +++ b/drivers/staging/rtl8723bs/hal/odm.c
> @@ -270,9 +270,9 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)
> if (is_multicast_ether_addr(pstat->hwaddr)) /* if (psta->mac_id == 1) */
> continue;
>
> - if (true == ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {
> + if (ODM_RAStateCheck(pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB,
> + false, &pstat->rssi_level))
> rtw_hal_update_ra_mask(pstat, pstat->rssi_level);
> - }
>
> }
> }
> diff --git a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
> index 994b8c578e7a..1e67e27994c7 100644
> --- a/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
> +++ b/drivers/staging/rtl8723bs/hal/odm_HWConfig.c
> @@ -240,9 +240,8 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm,
> if (is_cck_rate) {
> phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, pwdb_all));
> } else {
> - if (rf_rx_num != 0) {
> + if (rf_rx_num != 0)
> phy_info->signal_strength = (u8)(odm_signal_scale_mapping(dm_odm, total_rssi /= rf_rx_num));
> - }
> }
> }
>
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
> index af6cdda8238d..f4b2854bada7 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c
> @@ -25,9 +25,8 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num)
>
> do {
> valid = rtw_read8(padapter, REG_HMETFR) & BIT(msgbox_num);
> - if (0 == valid) {
> + if (valid == 0)
> read_down = true;
> - }
> } while ((!read_down) && (retry_cnts--));
>
> return read_down;
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> index 513d0c346c5e..87817bef180e 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
> @@ -197,9 +197,8 @@ static s32 polling_fwdl_chksum(
> yield();
> } while (jiffies_to_msecs(jiffies-start) < timeout_ms || cnt < min_cnt);
>
> - if (!(value32 & FWDL_ChkSum_rpt)) {
> + if (!(value32 & FWDL_ChkSum_rpt))
> goto exit;
> - }
>
> if (g_fwdl_chksum_fail) {
> g_fwdl_chksum_fail--;
> @@ -238,9 +237,8 @@ static s32 _FWFreeToGo(struct adapter *adapter, u32 min_cnt, u32 timeout_ms)
> yield();
> } while (jiffies_to_msecs(jiffies - start) < timeout_ms || cnt < min_cnt);
>
> - if (!(value32 & WINTINI_RDY)) {
> + if (!(value32 & WINTINI_RDY))
> goto exit;
> - }
>
> if (g_fwdl_wintint_rdy_fail) {
> g_fwdl_wintint_rdy_fail--;
> @@ -1048,9 +1046,8 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)
> rate_bitmap = hal_btcoex_GetRaMask(padapter);
> mask &= ~rate_bitmap;
>
> - if (pHalData->fw_ractrl) {
> + if (pHalData->fw_ractrl)
> rtl8723b_set_FwMacIdConfig_cmd(padapter, mac_id, psta->raid, psta->bw_mode, short_gi_rate, mask);
> - }
>
> /* set correct initial date rate for each mac_id */
> pdmpriv->INIDATA_RATE[mac_id] = psta->init_rate;
> @@ -1203,9 +1200,9 @@ void Hal_EfuseParseIDCode(struct adapter *padapter, u8 *hwinfo)
>
> /* Check 0x8129 again for making sure autoload status!! */
> EEPROMId = le16_to_cpu(*((__le16 *)hwinfo));
> - if (EEPROMId != RTL_EEPROM_ID) {
> + if (EEPROMId != RTL_EEPROM_ID)
> pEEPROM->bautoload_fail_flag = true;
> - } else
> + else
> pEEPROM->bautoload_fail_flag = false;
> }
>
> @@ -1590,13 +1587,12 @@ u8 SCMapping_8723B(struct adapter *Adapter, struct pkt_attrib *pattrib)
> if (pattrib->bwmode == CHANNEL_WIDTH_40) {
> SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
> } else if (pattrib->bwmode == CHANNEL_WIDTH_20) {
> - if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER) {
> + if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_UPPER)
> SCSettingOfDesc = HT_DATA_SC_20_UPPER_OF_40MHZ;
> - } else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER) {
> + else if (pHalData->nCur40MhzPrimeSC == HAL_PRIME_CHNL_OFFSET_LOWER)
> SCSettingOfDesc = HT_DATA_SC_20_LOWER_OF_40MHZ;
> - } else {
> + else
> SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
> - }
> }
> } else {
> SCSettingOfDesc = HT_DATA_SC_DONOT_CARE;
> @@ -1621,9 +1617,8 @@ static void rtl8723b_cal_txdesc_chksum(struct tx_desc *ptxdesc)
> /* Thomas, Lucas@SD4, 20130515 */
> count = 16;
>
> - for (index = 0; index < count; index++) {
> + for (index = 0; index < count; index++)
> checksum |= le16_to_cpu(*(__le16 *)(usPtr + index));
> - }
>
> ptxdesc->txdw7 |= cpu_to_le32(checksum & 0x0000ffff);
> }
> @@ -1796,11 +1791,10 @@ static void rtl8723b_fill_default_txdesc(
> ptxdesc->mbssid = pattrib->mbssid & 0xF;
>
> ptxdesc->rty_lmt_en = 1; /* retry limit enable */
> - if (pattrib->retry_ctrl) {
> + if (pattrib->retry_ctrl)
> ptxdesc->data_rt_lmt = 6;
> - } else {
> + else
> ptxdesc->data_rt_lmt = 12;
> - }
>
> ptxdesc->datarate = MRateToHwRate(pmlmeext->tx_rate);
>
> @@ -1891,9 +1885,8 @@ void rtl8723b_fill_fake_txdesc(
> SET_TX_DESC_HWSEQ_SEL_8723B(pDesc, 0);
> }
>
> - if (IsBTQosNull) {
> + if (IsBTQosNull)
> SET_TX_DESC_BT_INT_8723B(pDesc, 1);
> - }
>
> SET_TX_DESC_USE_RATE_8723B(pDesc, 1); /* use data rate which is set by Sw */
> SET_TX_DESC_OWN_8723B((u8 *)pDesc, 1);
> @@ -2209,9 +2202,8 @@ void CCX_FwC2HTxRpt_8723b(struct adapter *padapter, u8 *pdata, u8 len)
> #define GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 6, 1)
> #define GET_8723B_C2H_TX_RPT_RETRY_OVER(_Header) LE_BITS_TO_1BYTE((_Header + 0), 7, 1)
>
> - if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata)) {
> + if (GET_8723B_C2H_TX_RPT_RETRY_OVER(pdata) | GET_8723B_C2H_TX_RPT_LIFE_TIME_OVER(pdata))
> rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
> - }
> /*
> else if (seq_no != padapter->xmitpriv.seq_no) {
> rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_CCX_PKT_FAIL);
> @@ -2578,9 +2570,8 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val)
>
> /* Forece leave RF low power mode for 1T1R to prevent conficting setting in Fw power */
> /* saving sequence. 2010.06.07. Added by tynli. Suggested by SD3 yschang. */
> - if (psmode != PS_MODE_ACTIVE) {
> + if (psmode != PS_MODE_ACTIVE)
> ODM_RF_Saving(&pHalData->odmpriv, true);
> - }
>
> /* if (psmode != PS_MODE_ACTIVE) { */
> /* rtl8723b_set_lowpwr_lps_cmd(padapter, true); */
> @@ -2894,11 +2885,10 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
> break;
>
> case HAL_DEF_TX_PAGE_BOUNDARY:
> - if (!padapter->registrypriv.wifi_spec) {
> + if (!padapter->registrypriv.wifi_spec)
> *(u8 *)pval = TX_PAGE_BOUNDARY_8723B;
> - } else {
> + else
> *(u8 *)pval = WMM_NORMAL_TX_PAGE_BOUNDARY_8723B;
> - }
> break;
>
> case HAL_DEF_MACID_SLEEP:
> diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> index 379d29d3f9d3..f31884a0dfc1 100644
> --- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> +++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
> @@ -140,9 +140,8 @@ s32 rtl8723bs_xmit_buf_handler(struct adapter *padapter)
> return _SUCCESS;
>
> ret = rtw_register_tx_alive(padapter);
> - if (ret != _SUCCESS) {
> + if (ret != _SUCCESS)
> return _SUCCESS;
> - }
>
> do {
> queue_empty = rtl8723_dequeue_writeport(padapter);
> @@ -373,9 +372,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> spin_lock_bh(&pxmitpriv->lock);
> ret = rtw_txframes_pending(padapter);
> spin_unlock_bh(&pxmitpriv->lock);
> - if (ret == 0) {
> + if (ret == 0)
> return _SUCCESS;
> - }
>
> /* dequeue frame and write to hardware */
>
> @@ -393,9 +391,8 @@ static s32 rtl8723bs_xmit_handler(struct adapter *padapter)
> spin_lock_bh(&pxmitpriv->lock);
> ret = rtw_txframes_pending(padapter);
> spin_unlock_bh(&pxmitpriv->lock);
> - if (ret == 1) {
> + if (ret == 1)
> goto next;
> - }
>
> return _SUCCESS;
> }
> @@ -410,9 +407,8 @@ int rtl8723bs_xmit_thread(void *context)
>
> do {
> ret = rtl8723bs_xmit_handler(padapter);
> - if (signal_pending(current)) {
> + if (signal_pending(current))
> flush_signals(current);
> - }
> } while (_SUCCESS == ret);
>
> complete(&pxmitpriv->SdioXmitTerminate);
> diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
> index d664e254912c..a86252ccac76 100644
> --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
> +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c
> @@ -146,9 +146,8 @@ static void sdio_deinit(struct dvobj_priv *dvobj)
> sdio_claim_host(func);
> sdio_disable_func(func);
>
> - if (dvobj->irq_alloc) {
> + if (dvobj->irq_alloc)
> sdio_release_irq(func);
> - }
>
> sdio_release_host(func);
> }
> --
> 2.43.0
>
>
Hi,
This is the friendly patch-bot of Greg Kroah-Hartman. You have sent him
a patch that has triggered this response. He used to manually respond
to these common problems, but in order to save his sanity (he kept
writing the same thing over and over, yet to different people), I was
created. Hopefully you will not take offence and will fix the problem
in your patch and resubmit it so that it can be accepted into the Linux
kernel tree.
You are receiving this message because of the following common error(s)
as indicated below:
- This looks like a new version of a previously submitted patch, but you
did not list below the --- line any changes from the previous version.
Please read the section entitled "The canonical patch format" in the
kernel file, Documentation/process/submitting-patches.rst for what
needs to be done here to properly describe this.
If you wish to discuss this problem further, or you have questions about
how to resolve this issue, please feel free to respond to this email and
Greg will reply once he has dug out from the pending patches received
from other developers.
thanks,
greg k-h's patch email bot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-03-18 15:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-17 20:37 [PATCH] staging: rtl8723bs: remove unnecessary braces in single statement blocks Oskar Ray-Frayssinet
2026-03-18 13:04 ` kernel test robot
2026-03-18 13:48 ` kernel test robot
2026-03-18 15:57 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2026-03-11 23:30 Oskar Ray-Frayssinet
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox