staging: rtl8723bs: remove unnecessary braces in single statement blocks
PATCH 1/1 staging: rtl8723bs: remove unnecessary braces in single statement blocks
Remove unnecessary braces around single statement blocks throughout the rtl8723bs driver to comply with kernel coding style.
Signed-off-by Oskar Ray-Frayssinet <[email protected]>
--- 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(-)
drivers/staging/rtl8723bs/core/rtw_recv.c +2 -3
@@ -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) {
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +42 -66
253 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPhyRf.c +1 -2
@@ -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. */
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +7 -14
@@ -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 */
drivers/staging/rtl8723bs/hal/hal_btcoex.c +4 -5
@@ -1026,15 +1026,14 @@ void EXhalbtcoutsrc_SpecialPacketNotify(struct btc_coexist *pBtCoexist, u8 pktTyif (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); */
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +2 -4
@@ -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
drivers/staging/rtl8723bs/hal/hal_intf.c +2 -4
@@ -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)
drivers/staging/rtl8723bs/hal/odm.c +1 -2
@@ -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); - } } }
drivers/staging/rtl8723bs/hal/odm_DIG.c +10 -18
@@ -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 */
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +1 -2
@@ -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)); - } } }
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +2 -4
@@ -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 );
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +1 -2
@@ -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;
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +16 -26
123 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +4 -8
@@ -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);
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1 -2
@@ -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); }
Signature · 1 line
2.43.0