staging: rtl8723bs: coding style cleanups
cover staging: rtl8723bs: coding style cleanups
From: Luka Gejak <[email protected]>
This patch series resolves multiple coding style issues in the rtl8723bs driver to adhere to the Linux kernel coding style. The changes address various warnings reported by checkpatch.pl across the core, hal, and os_dep directories. No functional change intended.
Luka Gejak (11):
staging: rtl8723bs: core: fix spacing around operators and casts
staging: rtl8723bs: hal: fix spacing around operators and casts
staging: rtl8723bs: os_dep: fix spacing around operators
staging: rtl8723bs: core: align parameters with open parenthesis
staging: rtl8723bs: hal: align parameters with open parenthesis
staging: rtl8723bs: os_dep: align parameters with open parenthesis
staging: rtl8723bs: core: remove blank lines before closing brace
staging: rtl8723bs: hal: remove blank lines before closing brace
staging: rtl8723bs: os_dep: remove unnecessary braces
staging: rtl8723bs: os_dep: remove blank lines before closing braces
staging: rtl8723bs: hal: remove unnecessary braces
.../staging/rtl8723bs/core/rtw_ieee80211.c | 9 +- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 13 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 20 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 302 +++++++----------- drivers/staging/rtl8723bs/core/rtw_recv.c | 68 +--- drivers/staging/rtl8723bs/core/rtw_security.c | 7 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 20 +- .../staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 10 +- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 141 ++++---- .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 24 +- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 15 +- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 194 +++++------ drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 6 +- drivers/staging/rtl8723bs/hal/hal_btcoex.c | 9 +- drivers/staging/rtl8723bs/hal/hal_com.c | 25 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 38 +-- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +- drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 32 +- drivers/staging/rtl8723bs/hal/hal_sdio.c | 2 +- drivers/staging/rtl8723bs/hal/odm.c | 32 +- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 4 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 55 ++-- .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 9 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 57 ++-- .../rtl8723bs/hal/odm_RegConfig8723B.c | 6 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 93 +++--- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 7 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 260 +++++++-------- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 54 ++-- .../staging/rtl8723bs/hal/rtl8723b_rf6052.c | 3 - .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 8 +- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 15 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 8 +- drivers/staging/rtl8723bs/hal/sdio_ops.c | 1 - .../staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 +- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 5 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 39 files changed, 661 insertions(+), 915 deletions(-)
Signature · 1 line
2.53.0
PATCH 1/11 staging: rtl8723bs: core: fix spacing around operators and casts
From: Luka Gejak <[email protected]>
Fix spaces around operators and casts in the core directory to adhere to the Linux kernel coding style. This resolves multiple spacing warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 6 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 4 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 202 +++++++++--------- drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +- 4 files changed, 109 insertions(+), 109 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +3 -3
@@ -151,7 +151,7 @@ u8 rtw_set_802_11_ssid(struct adapter *padapter, struct ndis_802_11_ssid *ssid)else if (check_fwstate (pmlmepriv, _FW_UNDER_LINKING) == true) goto release_mlme_lock; -if (check_fwstate (pmlmepriv, _FW_LINKED|WIFI_ADHOC_MASTER_STATE ) == true) { +if (check_fwstate (pmlmepriv, _FW_LINKED |WIFI_ADHOC_MASTER_STATE ) == true) {if ((pmlmepriv->assoc_ssid.ssid_length == ssid->ssid_length) && (!memcmp (&pmlmepriv->assoc_ssid.ssid, ssid->ssid, ssid->ssid_length))) {if (check_fwstate (pmlmepriv,WIFI_STATION_STATE ) == false) {
@@ -487,13 +487,13 @@ u16 rtw_get_cur_max_rate(struct adapter *adapter) psta->htpriv.ht_cap.mcs.rx_mask); }else {while ((pcur_bss->supported_rates[i] !=0 ) && (pcur_bss->supported_rates[i] !=0xFF )) { - rate = pcur_bss->supported_rates[i]&0x7F ; + rate = pcur_bss->supported_rates[i] &0x7F ;if (rate > max_rate) max_rate = rate; i++; } - max_rate = max_rate*10 /2 ; + max_rate = max_rate *10 /2 ; }return max_rate;
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -2
@@ -1075,7 +1075,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_netrtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), (cur_network->network.ie_length)); -rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 ) cur_network->network.configuration.ds_config); +rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 )cur_network->network.configuration.ds_config); }static struct rt_pmkid_list backupPMKIDList[NUM_PMKID_CACHE ];
@@ -2502,7 +2502,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfrif (issued ==0 ) { psta->htpriv.candidate_tid_bitmap |=BIT ((u8 )priority); -rtw_addbareq_cmd (padapter, (u8 ) priority, pattrib->ra); +rtw_addbareq_cmd (padapter, (u8 )priority, pattrib->ra); } } }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +101 -101
579 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +3 -3
@@ -58,7 +58,7 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada/* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - */ /* ((SIZE_PTR) (precvpriv->pallocated_frame_buf) &(RXFRAME_ALIGN_SZ-1)); */ - precvframe = (union recv_frame *) precvpriv->precv_frame_buf; + precvframe = (union recv_frame *)precvpriv->precv_frame_buf;for (i =0 ; i <NR_RECVFRAME ; i++) {
@@ -1492,7 +1492,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_framestruct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;u8 *ptr = precv_frame->u.hdr.rx_data; -u8 ver = (unsigned char ) (*ptr) &0x3 ; +u8 ver = (unsigned char )(*ptr) &0x3 ;/* add version chk */ if (ver !=0 ) {
@@ -1545,7 +1545,7 @@ static signed int validate_recv_frame(struct adapter *adapter, union recv_framertw_hal_get_def_var (adapter,HAL_DEF_DBG_DUMP_RXPKT , &(bDumpRxPkt));/* get ether_type */ memcpy (ð_type, ptr + pattrib->hdrlen + pattrib->iv_len +LLC_HEADER_LENGTH ,2 ); - eth_type =ntohs ((unsigned short ) eth_type); + eth_type =ntohs ((unsigned short )eth_type);#endif }break ;
Signature · 1 line
2.53.0
PATCH 2/11 staging: rtl8723bs: hal: fix spacing around operators and casts
In reply to [email protected]From: Luka Gejak <[email protected]>
Fix spaces around operators and casts in the hal directory to adhere to the Linux kernel coding style. This resolves multiple spacing warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 24 +- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 8 +- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 150 ++++++------- drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 6 +- drivers/staging/rtl8723bs/hal/hal_com.c | 20 +- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 28 +-- drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 32 +-- drivers/staging/rtl8723bs/hal/hal_sdio.c | 2 +- drivers/staging/rtl8723bs/hal/odm.c | 18 +- .../staging/rtl8723bs/hal/odm_CfoTracking.c | 4 +- drivers/staging/rtl8723bs/hal/odm_DIG.c | 50 ++--- .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 8 +- drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 44 ++-- .../rtl8723bs/hal/odm_RegConfig8723B.c | 6 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 84 +++---- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 4 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 208 +++++++++--------- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 50 ++--- .../staging/rtl8723bs/hal/rtl8723bs_recv.c | 6 +- 19 files changed, 376 insertions(+), 376 deletions(-)
drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c +12 -12
@@ -218,7 +218,7 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm)for (i =0 ; i < ArrayLen; i +=2 ) {u32 v1 = Array[i]; -u32 v2 = Array[i+1 ]; +u32 v2 = Array[i +1 ];/* This (offset, data) pair doesn't care the condition. */ if (v1 <0x40000000 ) {
@@ -227,7 +227,7 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm) }else {/* This line is the beginning of branch. */ bool bMatched = true; -u8 cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 ); +u8 cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 );if (cCond ==COND_ELSE ) {/* ELSE, ENDIF */ bMatched = true;
@@ -247,22 +247,22 @@ void ODM_ReadAndConfig_MP_8723B_RadioA(struct dm_odm_t *pDM_Odm)* Condition isn't matched. * Discard the following (offset, data) pairs. */ -while (v1 <0x40000000 && i < ArrayLen-2 ) +while (v1 <0x40000000 && i < ArrayLen -2 )READ_NEXT_PAIR (v1, v2, i); i -=2 ;/* prevent from for-loop += 2 */ }else {/* Configure matched pairs and skip to end of if-else. */ -while (v1 <0x40000000 && i < ArrayLen-2 ) { +while (v1 <0x40000000 && i < ArrayLen -2 ) {odm_ConfigRF_RadioA_8723B (pDM_Odm, v1, v2);READ_NEXT_PAIR (v1, v2, i); }/* Keeps reading until ENDIF. */ - cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 ); -while (cCond !=COND_ENDIF && i < ArrayLen-2 ) { + cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 ); +while (cCond !=COND_ENDIF && i < ArrayLen -2 ) {READ_NEXT_PAIR (v1, v2, i); - cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 ); + cCond = (u8)((v1 & (BIT29 |BIT28 )) >>28 ); } } }
@@ -536,11 +536,11 @@ void ODM_ReadAndConfig_MP_8723B_TXPWR_LMT(struct dm_odm_t *pDM_Odm)for (i =0 ; i <ARRAY_SIZE (Array_MP_8723B_TXPWR_LMT); i +=6 ) {u8 *regulation = Array[i]; -u8 *bandwidth = Array[i+1 ]; -u8 *rate = Array[i+2 ]; -u8 *rfPath = Array[i+3 ]; -u8 *chnl = Array[i+4 ]; -u8 *val = Array[i+5 ]; +u8 *bandwidth = Array[i +1 ]; +u8 *rate = Array[i +2 ]; +u8 *rfPath = Array[i +3 ]; +u8 *chnl = Array[i +4 ]; +u8 *val = Array[i +5 ]; odm_ConfigBB_TXPWR_LMT_8723B( pDM_Odm,
drivers/staging/rtl8723bs/hal/HalPhyRf.c +4 -4
@@ -220,13 +220,13 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) pDM_Odm->RFCalibrateInfo.OFDM_index[p];/* 4 7.1 Handle boundary conditions of index. */ -if (pDM_Odm->RFCalibrateInfo.OFDM_index[p] > c.SwingTableSize_OFDM-1 ) - pDM_Odm->RFCalibrateInfo.OFDM_index[p] = c.SwingTableSize_OFDM-1 ; +if (pDM_Odm->RFCalibrateInfo.OFDM_index[p] > c.SwingTableSize_OFDM -1 ) + pDM_Odm->RFCalibrateInfo.OFDM_index[p] = c.SwingTableSize_OFDM -1 ;else if (pDM_Odm->RFCalibrateInfo.OFDM_index[p] < OFDM_min_index) pDM_Odm->RFCalibrateInfo.OFDM_index[p] = OFDM_min_index; } -if (pDM_Odm->RFCalibrateInfo.CCK_index > c.SwingTableSize_CCK-1 ) - pDM_Odm->RFCalibrateInfo.CCK_index = c.SwingTableSize_CCK-1 ; +if (pDM_Odm->RFCalibrateInfo.CCK_index > c.SwingTableSize_CCK -1 ) + pDM_Odm->RFCalibrateInfo.CCK_index = c.SwingTableSize_CCK -1 ;/* else if (pDM_Odm->RFCalibrateInfo.CCK_index < 0) */ /* pDM_Odm->RFCalibrateInfo.CCK_index = 0; */ }else {
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +75 -75
382 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c +3 -3
@@ -88,7 +88,7 @@ u8 HalPwrSeqCmdParsing( value &= (~(GET_PWR_CFG_MASK (PwrCfgCmd))); value |= (GET_PWR_CFG_VALUE (PwrCfgCmd) - &GET_PWR_CFG_MASK (PwrCfgCmd) + &GET_PWR_CFG_MASK (PwrCfgCmd) );/* Write the value back to system register */
@@ -106,7 +106,7 @@ u8 HalPwrSeqCmdParsing(else value =rtw_read8 (padapter, offset); - value = value&GET_PWR_CFG_MASK (PwrCfgCmd); + value = value &GET_PWR_CFG_MASK (PwrCfgCmd);if ( value == (GET_PWR_CFG_VALUE (PwrCfgCmd) & GET_PWR_CFG_MASK(PwrCfgCmd))
@@ -126,7 +126,7 @@ u8 HalPwrSeqCmdParsing(if (GET_PWR_CFG_VALUE (PwrCfgCmd) ==PWRSEQ_DELAY_US )udelay (GET_PWR_CFG_OFFSET (PwrCfgCmd));else -udelay (GET_PWR_CFG_OFFSET (PwrCfgCmd)*1000 ); +udelay (GET_PWR_CFG_OFFSET (PwrCfgCmd) *1000 );break ;case PWR_CMD_END :
drivers/staging/rtl8723bs/hal/hal_com.c +10 -10
@@ -552,7 +552,7 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst/* b/g mode ra_bitmap */ for (i =0 ; i <sizeof (psta->bssrateset); i++) {if (psta->bssrateset[i]) - tx_ra_bitmap |=rtw_get_bit_value_from_ieee_value (psta->bssrateset[i]&0x7f ); + tx_ra_bitmap |=rtw_get_bit_value_from_ieee_value (psta->bssrateset[i] &0x7f ); }/* n mode ra_bitmap */
@@ -560,13 +560,13 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst limit =8 ;/* 1R */ for (i =0 ; i < limit; i++) { -if (psta->htpriv.ht_cap.mcs.rx_mask[i/8 ] &BIT (i%8 )) - tx_ra_bitmap |=BIT (i+12 ); +if (psta->htpriv.ht_cap.mcs.rx_mask[i /8 ] &BIT (i %8 )) + tx_ra_bitmap |=BIT (i +12 ); } } psta->ra_mask = tx_ra_bitmap; - psta->init_rate =get_highest_rate_idx (tx_ra_bitmap)&0x3f ; + psta->init_rate =get_highest_rate_idx (tx_ra_bitmap) &0x3f ; }void SetHwReg (struct adapter *adapter,u8 variable,u8 *val)
@@ -583,7 +583,7 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)u16 reg_scr; reg_scr =rtw_read16 (adapter,REG_SECCFG ); -rtw_write16 (adapter,REG_SECCFG , reg_scr|SCR_CHK_KEYID |SCR_RxDecEnable|SCR_TxEncEnable); +rtw_write16 (adapter,REG_SECCFG , reg_scr |SCR_CHK_KEYID | SCR_RxDecEnable | SCR_TxEncEnable); }break ;case HW_VAR_SEC_DK_CFG :
@@ -594,9 +594,9 @@ void SetHwReg(struct adapter *adapter, u8 variable, u8 *val)if (val) {/* Enable default key related setting */ reg_scr |=SCR_TXBCUSEDK ;if (sec->dot11AuthAlgrthm != dot11AuthAlgrthm_8021X) - reg_scr |= (SCR_RxUseDK|SCR_TxUseDK); + reg_scr |= (SCR_RxUseDK | SCR_TxUseDK); }else /* Disable default key related setting */ - reg_scr &= ~(SCR_RXBCUSEDK |SCR_TXBCUSEDK |SCR_RxUseDK|SCR_TxUseDK); + reg_scr &= ~(SCR_RXBCUSEDK |SCR_TXBCUSEDK | SCR_RxUseDK | SCR_TxUseDK);rtw_write8 (adapter,REG_SECCFG , reg_scr); }
@@ -773,7 +773,7 @@ bool GetU1ByteIntegerFromStringInDecimal(char *Str, u8 *pInt)void rtw_hal_check_rxfifo_full (struct adapter *adapter) {/* switch counter to RX fifo */ -rtw_write8 (adapter,REG_RXERR_RPT +3 ,rtw_read8 (adapter,REG_RXERR_RPT +3 )|0xf0 ); +rtw_write8 (adapter,REG_RXERR_RPT +3 ,rtw_read8 (adapter,REG_RXERR_RPT +3 ) |0xf0 ); }static u32 Array_kfreemap[] = {
@@ -805,13 +805,13 @@ void rtw_bb_rf_gain_offset(struct adapter *padapter)for (i =0 ; i <ARRAY_SIZE (Array_kfreemap); i +=2 ) { v1 = Array[i]; - v2 = Array[i+1 ]; + v2 = Array[i +1 ];if (v1 == padapter->eeprompriv.EEPROMRFGainVal) { target = v2;break ; } } -PHY_SetRFReg (padapter,RF_PATH_A ,REG_RF_BB_GAIN_OFFSET ,BIT18 |BIT17 |BIT16 |BIT15 , target); +PHY_SetRFReg (padapter,RF_PATH_A ,REG_RF_BB_GAIN_OFFSET ,BIT18 |BIT17 |BIT16 |BIT15 , target);rtw_hal_read_rfreg (padapter,RF_PATH_A ,0x7f ,0xffffffff ); }
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +14 -14
@@ -152,7 +152,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_12M ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_18M );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -165,7 +165,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_48M ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_54M );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -173,7 +173,7 @@ PHY_GetRateValuesOfTxPowerByRate(case rTxAGC_A_CCK1_Mcs32: RateIndex[0 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_1M ); - PwrByRateVal[0 ] = (s8) ((((Value >> (8 +4 )) &0xF )) *10 + + PwrByRateVal[0 ] = (s8)((((Value >> (8 +4 )) &0xF )) *10 + ((Value >>8 ) &0xF )); *RateNum =1 ;break ;
@@ -184,13 +184,13 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[1 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_5_5M ); RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_11M );for (i =1 ; i <4 ; ++i) { - PwrByRateVal[i -1 ] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i -1 ] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =3 ; }else if (BitMask ==0x000000ff ) { RateIndex[0 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_11M ); - PwrByRateVal[0 ] = (s8) ((((Value >>4 ) &0xF )) *10 + (Value &0xF )); + PwrByRateVal[0 ] = (s8)((((Value >>4 ) &0xF )) *10 + (Value &0xF )); *RateNum =1 ; }break ;
@@ -202,7 +202,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS2 ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS3 );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -215,7 +215,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS6 ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS7 );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -226,7 +226,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[1 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_2M ); RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_5_5M );for (i =1 ; i <4 ; ++i) { - PwrByRateVal[i -1 ] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i -1 ] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =3 ;
@@ -241,7 +241,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_5_5M ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_11M );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -256,7 +256,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_12M ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_18M );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -271,7 +271,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_48M ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_54M );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -286,7 +286,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS2 ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS3 );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -301,7 +301,7 @@ PHY_GetRateValuesOfTxPowerByRate( RateIndex[2 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS6 ); RateIndex[3 ] =PHY_GetRateIndexOfTxPowerByRate (MGN_MCS7 );for (i =0 ; i <4 ; ++i) { - PwrByRateVal[i] = (s8) ((((Value >> (i *8 +4 )) &0xF )) *10 + + PwrByRateVal[i] = (s8)((((Value >> (i *8 +4 )) &0xF )) *10 + ((Value >> (i *8 )) &0xF )); } *RateNum =4 ;
@@ -459,7 +459,7 @@ u8 PHY_GetTxPowerIndexBase( {struct hal_com_data *pHalData =GET_HAL_DATA (padapter);u8 txPower =0 ; -u8 chnlIdx = (Channel-1 ); +u8 chnlIdx = (Channel -1 );if (HAL_IsLegalChannel (padapter, Channel) == false) chnlIdx =0 ;
drivers/staging/rtl8723bs/hal/hal_pwr_seq.c +16 -16
@@ -22,7 +22,7 @@ Major Change History:/* drivers should parse below arrays and do the corresponding actions */ /* 3 Power on Array */ struct wlan_pwr_cfg rtl8723B_power_on_flow[ -RTL8723B_TRANS_CARDEMU_TO_ACT_STEPS + +RTL8723B_TRANS_CARDEMU_TO_ACT_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_CARDEMU_TO_ACT
@@ -31,7 +31,7 @@ struct wlan_pwr_cfg rtl8723B_power_on_flow[/* 3Radio off GPIO Array */ struct wlan_pwr_cfg rtl8723B_radio_off_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_ACT_TO_CARDEMU
@@ -40,8 +40,8 @@ struct wlan_pwr_cfg rtl8723B_radio_off_flow[/* 3Card Disable Array */ struct wlan_pwr_cfg rtl8723B_card_disable_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + -RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_ACT_TO_CARDEMU
@@ -51,8 +51,8 @@ struct wlan_pwr_cfg rtl8723B_card_disable_flow[/* 3 Card Enable Array */ struct wlan_pwr_cfg rtl8723B_card_enable_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + -RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_CARDDIS_TO_CARDEMU
@@ -62,8 +62,8 @@ struct wlan_pwr_cfg rtl8723B_card_enable_flow[/* 3Suspend Array */ struct wlan_pwr_cfg rtl8723B_suspend_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + -RTL8723B_TRANS_CARDEMU_TO_SUS_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_CARDEMU_TO_SUS_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_ACT_TO_CARDEMU
@@ -73,8 +73,8 @@ struct wlan_pwr_cfg rtl8723B_suspend_flow[/* 3 Resume Array */ struct wlan_pwr_cfg rtl8723B_resume_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + -RTL8723B_TRANS_CARDEMU_TO_SUS_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_CARDEMU_TO_SUS_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_SUS_TO_CARDEMU
@@ -84,8 +84,8 @@ struct wlan_pwr_cfg rtl8723B_resume_flow[/* 3HWPDN Array */ struct wlan_pwr_cfg rtl8723B_hwpdn_flow[ -RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + -RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS + +RTL8723B_TRANS_ACT_TO_CARDEMU_STEPS + +RTL8723B_TRANS_CARDEMU_TO_PDN_STEPS +RTL8723B_TRANS_END_STEPS ] = {RTL8723B_TRANS_ACT_TO_CARDEMU
@@ -95,7 +95,7 @@ struct wlan_pwr_cfg rtl8723B_hwpdn_flow[/* 3 Enter LPS */ struct wlan_pwr_cfg rtl8723B_enter_lps_flow[ -RTL8723B_TRANS_ACT_TO_LPS_STEPS +RTL8723B_TRANS_END_STEPS +RTL8723B_TRANS_ACT_TO_LPS_STEPS +RTL8723B_TRANS_END_STEPS ] = {/* FW behavior */ RTL8723B_TRANS_ACT_TO_LPS
@@ -104,7 +104,7 @@ struct wlan_pwr_cfg rtl8723B_enter_lps_flow[/* 3 Leave LPS */ struct wlan_pwr_cfg rtl8723B_leave_lps_flow[ -RTL8723B_TRANS_LPS_TO_ACT_STEPS +RTL8723B_TRANS_END_STEPS +RTL8723B_TRANS_LPS_TO_ACT_STEPS +RTL8723B_TRANS_END_STEPS ] = {/* FW behavior */ RTL8723B_TRANS_LPS_TO_ACT
@@ -113,7 +113,7 @@ struct wlan_pwr_cfg rtl8723B_leave_lps_flow[/* 3 Enter SW LPS */ struct wlan_pwr_cfg rtl8723B_enter_swlps_flow[ -RTL8723B_TRANS_ACT_TO_SWLPS_STEPS +RTL8723B_TRANS_END_STEPS +RTL8723B_TRANS_ACT_TO_SWLPS_STEPS +RTL8723B_TRANS_END_STEPS ] = {/* SW behavior */ RTL8723B_TRANS_ACT_TO_SWLPS
@@ -122,7 +122,7 @@ struct wlan_pwr_cfg rtl8723B_enter_swlps_flow[/* 3 Leave SW LPS */ struct wlan_pwr_cfg rtl8723B_leave_swlps_flow[ -RTL8723B_TRANS_SWLPS_TO_ACT_STEPS +RTL8723B_TRANS_END_STEPS +RTL8723B_TRANS_SWLPS_TO_ACT_STEPS +RTL8723B_TRANS_END_STEPS ] = {/* SW behavior */ RTL8723B_TRANS_SWLPS_TO_ACT
drivers/staging/rtl8723bs/hal/hal_sdio.c +1 -1
@@ -24,7 +24,7 @@ u8 rtw_hal_sdio_query_tx_freepage( {struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -if ((pHalData->SdioTxFIFOFreePage[PageIdx]+pHalData->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX ]) >= (RequiredPageNum)) +if ((pHalData->SdioTxFIFOFreePage[PageIdx] + pHalData->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX ]) >= (RequiredPageNum))return true;else return false;
drivers/staging/rtl8723bs/hal/odm.c +9 -9
@@ -131,8 +131,8 @@ u8 CCKSwingTable_Ch14_New[CCK_TABLE_SIZE][8] = {static void odm_CommonInfoSelfInit (struct dm_odm_t *pDM_Odm) { - pDM_Odm->bCckHighPower = (bool )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (CCK_RPT_FORMAT ),ODM_BIT (CCK_RPT_FORMAT )); - pDM_Odm->RFPathRxEnable = (u8 )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (BB_RX_PATH ),ODM_BIT (BB_RX_PATH )); + pDM_Odm->bCckHighPower = (bool )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (CCK_RPT_FORMAT ),ODM_BIT (CCK_RPT_FORMAT )); + pDM_Odm->RFPathRxEnable = (u8 )PHY_QueryBBReg (pDM_Odm->Adapter,ODM_REG (BB_RX_PATH ),ODM_BIT (BB_RX_PATH )); pDM_Odm->TxRate =0xFF ; }
@@ -145,9 +145,9 @@ static void odm_CommonInfoSelfUpdate(struct dm_odm_t *pDM_Odm)if (*(pDM_Odm->pBandWidth) ==ODM_BW40M ) {if (*(pDM_Odm->pSecChOffset) ==1 ) - pDM_Odm->ControlChannel = *(pDM_Odm->pChannel)-2 ; + pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) -2 ;else if (*(pDM_Odm->pSecChOffset) ==2 ) - pDM_Odm->ControlChannel = *(pDM_Odm->pChannel)+2 ; + pDM_Odm->ControlChannel = *(pDM_Odm->pChannel) +2 ; }else pDM_Odm->ControlChannel = *(pDM_Odm->pChannel);
@@ -219,7 +219,7 @@ u32 ODM_Get_Rate_Bitmap( rate_bitmap =0x00000ff0 ;break ; -case (ODM_WM_B |ODM_WM_G ): +case (ODM_WM_B |ODM_WM_G ):if (rssi_level ==DM_RATR_STA_HIGH ) rate_bitmap =0x00000f00 ;else if (rssi_level ==DM_RATR_STA_MIDDLE )
@@ -228,9 +228,9 @@ u32 ODM_Get_Rate_Bitmap( rate_bitmap =0x00000ff5 ;break ; -case (ODM_WM_B |ODM_WM_G |ODM_WM_N24G ): -case (ODM_WM_B |ODM_WM_N24G ): -case (ODM_WM_G |ODM_WM_N24G ): +case (ODM_WM_B |ODM_WM_G |ODM_WM_N24G ): +case (ODM_WM_B |ODM_WM_N24G ): +case (ODM_WM_G |ODM_WM_N24G ):if (rssi_level ==DM_RATR_STA_HIGH ) rate_bitmap =0x000f0000 ;else if (rssi_level ==DM_RATR_STA_MIDDLE )
@@ -425,7 +425,7 @@ static void odm_RSSIMonitorCheckCE(struct dm_odm_t *pDM_Odm) tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1 )) - PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16 )); + PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB <<16 )); } }
drivers/staging/rtl8723bs/hal/odm_CfoTracking.c +2 -2
@@ -122,8 +122,8 @@ void ODM_CfoTracking(void *pDM_VOID)/* 4 1.3 Avoid abnormal large CFO */ CFO_ave_diff = (pCfoTrack->CFO_ave_pre >= CFO_ave) ? - (pCfoTrack->CFO_ave_pre-CFO_ave) : - (CFO_ave-pCfoTrack->CFO_ave_pre); + (pCfoTrack->CFO_ave_pre - CFO_ave) : + (CFO_ave - pCfoTrack->CFO_ave_pre); if ( CFO_ave_diff > 20 &&
drivers/staging/rtl8723bs/hal/odm_DIG.c +25 -25
151 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c +4 -4
@@ -34,10 +34,10 @@ void ODM_RF_Saving(void *pDM_VOID, u8 bForceInNormal)if (pDM_PSTable->initialize ==0 ) { - pDM_PSTable->Reg874 = (PHY_QueryBBReg (pDM_Odm->Adapter,0x874 , bMaskDWord)&0x1CC000 )>>14 ; - pDM_PSTable->RegC70 = (PHY_QueryBBReg (pDM_Odm->Adapter,0xc70 , bMaskDWord)&BIT3 )>>3 ; - pDM_PSTable->Reg85C = (PHY_QueryBBReg (pDM_Odm->Adapter,0x85c , bMaskDWord)&0xFF000000 )>>24 ; - pDM_PSTable->RegA74 = (PHY_QueryBBReg (pDM_Odm->Adapter,0xa74 , bMaskDWord)&0xF000 )>>12 ; + pDM_PSTable->Reg874 = (PHY_QueryBBReg (pDM_Odm->Adapter,0x874 , bMaskDWord) &0x1CC000 ) >>14 ; + pDM_PSTable->RegC70 = (PHY_QueryBBReg (pDM_Odm->Adapter,0xc70 , bMaskDWord) &BIT3 ) >>3 ; + pDM_PSTable->Reg85C = (PHY_QueryBBReg (pDM_Odm->Adapter,0x85c , bMaskDWord) &0xFF000000 ) >>24 ; + pDM_PSTable->RegA74 = (PHY_QueryBBReg (pDM_Odm->Adapter,0xa74 , bMaskDWord) &0xF000 ) >>12 ;/* Reg818 = PHY_QueryBBReg(padapter, 0x818, bMaskDWord); */ pDM_PSTable->initialize =1 ; }
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +22 -22
112 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c +3 -3
@@ -33,7 +33,7 @@ void odm_ConfigRFReg_8723B(udelay (1 ); -while ((getvalue>>8 ) != (Data>>8 )) { +while ((getvalue >>8 ) != (Data >>8 )) { count++;PHY_SetRFReg (pDM_Odm->Adapter,RF_PATH , RegAddr, bRFRegOffsetMask, Data);udelay (1 );
@@ -87,14 +87,14 @@ void odm_ConfigRFReg_8723B(void odm_ConfigRF_RadioA_8723B (struct dm_odm_t *pDM_Odm,u32 Addr,u32 Data) {u32 content =0x1000 ;/* RF_Content: radioa_txt */ -u32 maskforPhySet = (u32)(content&0xE000 ); +u32 maskforPhySet = (u32)(content &0xE000 );odm_ConfigRFReg_8723B ( pDM_Odm, Addr, Data,RF_PATH_A , - Addr|maskforPhySet + Addr | maskforPhySet ); }
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +42 -42
271 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +2 -2
@@ -45,7 +45,7 @@ static void Init_ODM_ComInfo_8723b(struct adapter *Adapter)/* ODM_CMNINFO_BINHCT_TEST only for MP Team */ ODM_CmnInfoInit (pDM_Odm,ODM_CMNINFO_BWIFI_TEST , Adapter->registrypriv.wifi_spec); - pdmpriv->InitODMFlag =ODM_RF_CALIBRATION |ODM_RF_TX_PWR_TRACK ; + pdmpriv->InitODMFlag =ODM_RF_CALIBRATION |ODM_RF_TX_PWR_TRACK ;ODM_CmnInfoUpdate (pDM_Odm,ODM_CMNINFO_ABILITY , pdmpriv->InitODMFlag); }
@@ -189,7 +189,7 @@ void rtl8723b_hal_dm_in_lps(struct adapter *padapter)/* set rssi to fw */ psta =rtw_get_stainfo (pstapriv,get_bssid (pmlmepriv));if (psta && (psta->rssi_stat.UndecoratedSmoothedPWDB >0 )) { - PWDB_rssi = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16 )); + PWDB_rssi = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB <<16 ));rtl8723b_set_rssi_cmd (padapter, (u8 *)&PWDB_rssi); }
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +104 -104
659 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +25 -25
131 lines not on this page · raw message
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +3 -3
@@ -335,8 +335,8 @@ static void rtl8723bs_recv_tasklet(struct tasklet_struct *t) C2hEvent.CmdID = pbuf_c2h[0 ]; C2hEvent.CmdSeq = pbuf_c2h[1 ]; - C2hEvent.CmdLen = (len_c2h-2 ); - pdata_c2h = pbuf_c2h+2 ; + C2hEvent.CmdLen = (len_c2h -2 ); + pdata_c2h = pbuf_c2h +2 ;if (C2hEvent.CmdID ==C2H_CCX_TX_RPT )CCX_FwC2HTxRpt_8723b (padapter, pdata_c2h, C2hEvent.CmdLen);
@@ -403,7 +403,7 @@ s32 rtl8723bs_init_recv_priv(struct adapter *padapter) precvbuf->pskb->dev = padapter->pnetdev; tmpaddr = (SIZE_PTR )precvbuf->pskb->data; - alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 ); + alignment = tmpaddr & (RECVBUFF_ALIGN_SZ -1 );skb_reserve (precvbuf->pskb, (RECVBUFF_ALIGN_SZ - alignment)); } }
Signature · 1 line
2.53.0
PATCH 3/11 staging: rtl8723bs: os_dep: fix spacing around operators
In reply to [email protected]From: Luka Gejak <[email protected]>
Fix spaces around operators in the os_dep directory to adhere to the Linux kernel coding style. This resolves multiple spacing warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1 -1
@@ -77,7 +77,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_release_host (func); -return err?_FAIL:_SUCCESS; +return err ? _FAIL : _SUCCESS; }static void sdio_free_irq (struct dvobj_priv *dvobj)
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1 -1
@@ -93,7 +93,7 @@ static int _rtw_reg_notifier_apply(struct wiphy *wiphy,static const struct ieee80211_regdomain *_rtw_regdomain_select (struct rtw_regulatory - *reg) + * reg) {return &rtw_regdom_rd; }
Signature · 1 line
2.53.0
Greg Kroah-Hartman
maintainerRe: [PATCH 03/11] staging: rtl8723bs: os_dep: fix spacing around operators
Quoted 30 lines · On Mon, Apr 13, 2026 at 12:14:24PM +0200, [email protected] wrote:
From: Luka Gejak <[email protected]>
Fix spaces around operators in the
os_depdirectory to adhere to the Linux kernel coding style. This resolves multiple spacing warnings reported by checkpatch.pl.Signed-off-by Luka Gejak <[email protected]>--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1
-1@@ -77,7 +77,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_release_host (func); -return err?_FAIL:_SUCCESS; +return err ? _FAIL : _SUCCESS; }static void sdio_free_irq (struct dvobj_priv *dvobj)drivers/staging/rtl8723bs/os_dep/wifi_regd.c +0
-0
drivers/staging/rtl8723bs/os_dep/wifi_regd.c static int _rtw_reg_notifier_apply(struct wiphy *wiphy, · line 96
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1
-1@@ -93,7 +93,7 @@ static int _rtw_reg_notifier_apply(struct wiphy *wiphy,static const struct ieee80211_regdomain *_rtw_regdomain_select (struct rtw_regulatory - *reg) + * reg)
What just happened? How was this generated? What tool did you use?
And this series is way too big. Please break it up into smaller parts per patch.
thanks,
greg k-h
Re: [PATCH 03/11] staging: rtl8723bs: os_dep: fix spacing around operators
Quoted 39 lines · Greg Kroah-Hartman
Quoted 30 lines · On Mon, Apr 13, 2026 at 12:14:24PM +0200, [email protected] wrote:
From: Luka Gejak <[email protected]>
Fix spaces around operators in the
os_depdirectory to adhere to the Linux kernel coding style. This resolves multiple spacing warnings reported by checkpatch.pl.Signed-off-by Luka Gejak <[email protected]>--- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 2 +- drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1
-1@@ -77,7 +77,7 @@ static int sdio_alloc_irq(struct dvobj_priv *dvobj)sdio_release_host (func); -return err?_FAIL:_SUCCESS; +return err ? _FAIL : _SUCCESS; }static void sdio_free_irq (struct dvobj_priv *dvobj)drivers/staging/rtl8723bs/os_dep/wifi_regd.c +0
-0drivers/staging/rtl8723bs/os_dep/wifi_regd.c static int _rtw_reg_notifier_apply(struct wiphy *wiphy, · line 96
Quoted 5 lines
drivers/staging/rtl8723bs/os_dep/wifi_regd.c +1
-1@@ -93,7 +93,7 @@ static int _rtw_reg_notifier_apply(struct wiphy *wiphy,static const struct ieee80211_regdomain *_rtw_regdomain_select (struct rtw_regulatory - *reg) + * reg)What just happened? How was this generated? What tool did you use?
Quoted 6 lines
And this series is way too big. Please break it up into smaller parts per patch.
thanks,
greg k-h
Hi Greg,
I used vscode's find and replace and I think when I clicked a shortcut to replace all I might have mistimed it and it registred enter instead. And space between * and reg is introduces by same feature, which is my mistake for not catching before sending. I will fix it and split this series into multiple ones.
Best regard,
Luka Gejak
PATCH 4/11 staging: rtl8723bs: core: align parameters with open parenthesis
In reply to [email protected]From: Luka Gejak <[email protected]>
Align function parameters with the open parenthesis in the core directory to adhere to the Linux kernel coding style. This resolves "Alignment should match open parenthesis" warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/core/rtw_ieee80211.c | 8 +-- .../staging/rtl8723bs/core/rtw_ioctl_set.c | 4 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 16 +++--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 52 +++++++++---------- drivers/staging/rtl8723bs/core/rtw_recv.c | 24 ++++----- drivers/staging/rtl8723bs/core/rtw_security.c | 4 +- drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 20 +++---- 9 files changed, 66 insertions(+), 66 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +4 -4
@@ -107,7 +107,7 @@ int rtw_check_network_type(unsigned char *rate, int channel) }u8 *rtw_set_fixed_ie (unsigned char *pbuf,unsigned int len,unsigned char *source, -unsigned int *frlen) +unsigned int *frlen) {memcpy (pbuf, source, len); *frlen = *frlen + len;
@@ -700,7 +700,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 *buf_att *len_attr =0 ;if ((wps_ie[0 ] !=WLAN_EID_VENDOR_SPECIFIC ) || - (memcmp (wps_ie +2 , wps_oui,4 ))) { + (memcmp (wps_ie +2 , wps_oui,4 ))) {return attr_ptr; }
@@ -764,7 +764,7 @@ u8 *rtw_get_wps_attr_content(u8 *wps_ie, uint wps_ielen, u16 target_attr_id, u8 }static int rtw_ieee802_11_parse_vendor_specific (u8 *pos,uint elen, -struct rtw_ieee802_11_elems *elems, +struct rtw_ieee802_11_elems *elems,int show_errors) {unsigned int oui;
@@ -910,7 +910,7 @@ enum parse_result rtw_ieee802_11_parse_elems(u8 *start, uint len,break ;case WLAN_EID_VENDOR_SPECIFIC :if (rtw_ieee802_11_parse_vendor_specific (pos, elen, - elems, + elems, show_errors)) unknown++;break ;
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +2 -2
@@ -280,7 +280,7 @@ u8 rtw_set_802_11_connect(struct adapter *padapter, u8 *bssid, struct ndis_802_1 }u8 rtw_set_802_11_infrastructure_mode (struct adapter *padapter, -enum ndis_802_11_network_infrastructure networktype) +enum ndis_802_11_network_infrastructure networktype) {struct mlme_priv *pmlmepriv = &padapter->mlmepriv;struct wlan_network *cur_network = &pmlmepriv->cur_network;
@@ -300,7 +300,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter *padapter,rtw_disassoc_cmd (padapter,0 , true);if ((check_fwstate (pmlmepriv, _FW_LINKED) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true))rtw_free_assoc_resources (padapter,1 );if ((*pold_state == Ndis802_11Infrastructure) || (*pold_state == Ndis802_11IBSS)) {
drivers/staging/rtl8723bs/core/rtw_mlme.c +8 -8
@@ -265,7 +265,7 @@ void rtw_free_network_queue(struct adapter *padapter, u8 isfreeall)bool rtw_if_up (struct adapter *padapter) {if (padapter->bDriverStopped || padapter->bSurpriseRemoved || - !check_fwstate (&padapter->mlmepriv, _FW_LINKED)) + !check_fwstate (&padapter->mlmepriv, _FW_LINKED))return false;return true;
@@ -331,7 +331,7 @@ bool rtw_is_same_ibss(struct adapter *adapter, struct wlan_network *pnetwork)struct security_priv *psecuritypriv = &adapter->securitypriv;if ((psecuritypriv->dot11PrivacyAlgrthm != _NO_PRIVACY_) && - (pnetwork->network.privacy ==0 )) + (pnetwork->network.privacy ==0 ))return false;else if ((psecuritypriv->dot11PrivacyAlgrthm == _NO_PRIVACY_) && (pnetwork->network.privacy ==1 ))
@@ -409,7 +409,7 @@ struct wlan_network *rtw_get_oldest_wlan_network(struct __queue *scanned_queue) }void update_network (struct wlan_bssid_ex *dst,struct wlan_bssid_ex *src, -struct adapter *padapter,bool update_ie) +struct adapter *padapter,bool update_ie) {long rssi_ori = dst->rssi;
@@ -458,14 +458,14 @@ static void update_current_network(struct adapter *adapter, struct wlan_bssid_exstruct mlme_priv *pmlmepriv = &adapter->mlmepriv;rtw_bug_check (&pmlmepriv->cur_network.network, - &pmlmepriv->cur_network.network, + &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network, &pmlmepriv->cur_network.network);if (check_fwstate (pmlmepriv, _FW_LINKED) && (is_same_network (&pmlmepriv->cur_network.network, pnetwork,0 ))) {update_network (&pmlmepriv->cur_network.network, pnetwork, adapter, true);rtw_update_protection (adapter, (pmlmepriv->cur_network.network.ies) +sizeof (struct ndis_802_11_fix_ie ), - pmlmepriv->cur_network.network.ie_length); + pmlmepriv->cur_network.network.ie_length); } }
@@ -1073,7 +1073,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net }rtw_update_protection (padapter, (cur_network->network.ies) +sizeof (struct ndis_802_11_fix_ie ), - (cur_network->network.ie_length)); + (cur_network->network.ie_length));rtw_update_ht_cap (padapter, cur_network->network.ies, cur_network->network.ie_length, (u8 )cur_network->network.configuration.ds_config); }
@@ -1441,7 +1441,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf) }if (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) || -check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) { +check_fwstate (pmlmepriv,WIFI_ADHOC_STATE )) {rtw_free_stainfo (adapter, psta);if (adapter->stapriv.asoc_sta_count ==1 ) {/* a sta + bc/mc_stainfo (not Ibss_stainfo) */
@@ -1998,7 +1998,7 @@ static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)for (i =0 ; i <NUM_PMKID_CACHE ; i++)if ((p->PMKIDList[i].bUsed) && - (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN ))) + (!memcmp (p->PMKIDList[i].Bssid, bssid,ETH_ALEN )))return i;return -1 ; }
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +26 -26
206 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +12 -12
@@ -337,7 +337,7 @@ static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup) key_type |=NL80211_KEYTYPE_PAIRWISE ;cfg80211_michael_mic_failure (padapter->pnetdev, (u8 *)&pmlmepriv->assoc_bssid[0 ], key_type,-1 , -NULL ,GFP_ATOMIC ); +NULL ,GFP_ATOMIC );memset (&ev,0x00 ,sizeof (ev));if (bgroup)
@@ -701,7 +701,7 @@ static void count_rx_stats(struct adapter *padapter, union recv_frame *prframe, }static signed int sta2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, -struct sta_info **psta) +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;signed int ret = _SUCCESS;
@@ -714,7 +714,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *signed int bmcast =is_multicast_ether_addr (pattrib->dst);if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) {/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) {
@@ -789,7 +789,7 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame * }static signed int ap2sta_data_frame (struct adapter *adapter,union recv_frame *precv_frame, -struct sta_info **psta) +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -894,7 +894,7 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p }static signed int sta2ap_data_frame (struct adapter *adapter,union recv_frame *precv_frame, -struct sta_info **psta) +struct sta_info **psta) {u8 *ptr = precv_frame->u.hdr.rx_data;struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
@@ -1416,7 +1416,7 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame adapter->securitypriv.binstallBIPkey == true) {/* unicast management frame decrypt */ if (pattrib->privacy && !(is_multicast_ether_addr (GetAddr1Ptr (ptr))) && - (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || subtype ==WIFI_ACTION )) { + (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || subtype ==WIFI_ACTION )) {u8 *mgmt_DATA;u32 data_len =0 ;
@@ -1457,10 +1457,10 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame }else {/* 802.11w protect */ if (subtype ==WIFI_ACTION ) {/* according 802.11-2012 standard, these five types are not robust types */ -if (ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_PUBLIC && - ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_HT && +if (ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_PUBLIC && + ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_HT && ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_UNPROTECTED_WNM && - ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_SELF_PROTECTED && + ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_SELF_PROTECTED && ptr[WLAN_HDR_A3_LEN ] !=RTW_WLAN_CATEGORY_P2P ) { goto validate_80211w_fail; }
@@ -1580,7 +1580,7 @@ static signed int wlanhdr_to_ethhdr(union recv_frame *precvframe)/* convert hdr + possible LLC headers into Ethernet header */ /* eth_type = (psnap_type[0] << 8) | psnap_type[1]; */ if ((!memcmp (psnap, rfc1042_header,SNAP_SIZE ) && - (memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 )) && + (memcmp (psnap_type,SNAP_ETH_TYPE_IPX ,2 )) && (memcmp (psnap_type,SNAP_ETH_TYPE_APPLETALK_AARP ,2 ))) ||/* eth_type != ETH_P_AARP && eth_type != ETH_P_IPX) || */ !memcmp (psnap, bridge_tunnel_header,SNAP_SIZE )) {
@@ -1644,7 +1644,7 @@ static struct sk_buff *rtw_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubfra eth_type =get_unaligned_be16 (&sub_skb->data[6 ]);if (sub_skb->len >=8 && - ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && + ((!memcmp (sub_skb->data, rfc1042_header,SNAP_SIZE ) && eth_type !=ETH_P_AARP && eth_type !=ETH_P_IPX ) || !memcmp (sub_skb->data, bridge_tunnel_header,SNAP_SIZE ))) {/*
@@ -2198,7 +2198,7 @@ static int recv_func(struct adapter *padapter, union recv_frame *rframe)/* check if need to enqueue into uc_swdec_pending_queue*/ if (check_fwstate (mlmepriv,WIFI_STATION_STATE ) && - !is_multicast_ether_addr (prxattrib->ra) && prxattrib->encrypt >0 && + !is_multicast_ether_addr (prxattrib->ra) && prxattrib->encrypt >0 && (prxattrib->bdecrypted ==0 || psecuritypriv->sw_decrypt == true) && psecuritypriv->ndisauthtype == Ndis802_11AuthModeWPAPSK && !psecuritypriv->busetkipkey) {
drivers/staging/rtl8723bs/core/rtw_security.c +2 -2
@@ -786,7 +786,7 @@ static void construct_ctr_preload(u8 *ctr_preload, }static signed int aes_cipher (u8 *key,uint hdrlen, -u8 *pframe,uint plen) +u8 *pframe,uint plen) {uint qc_exists, a4_exists, i, j, payload_remainder, num_blocks, payload_index;
@@ -989,7 +989,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe) }static signed int aes_decipher (u8 *key,uint hdrlen, -u8 *pframe,uint plen) +u8 *pframe,uint plen) {static u8 message[MAX_MSG_SIZE ]; uint qc_exists, a4_exists, i, j, payload_remainder,
drivers/staging/rtl8723bs/core/rtw_sta_mgt.c +1 -1
@@ -249,7 +249,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)/* init recv timer */ timer_setup (&preorder_ctrl->reordering_ctrl_timer, - rtw_reordering_ctrl_timeout_handler,0 ); + rtw_reordering_ctrl_timeout_handler,0 ); }/* init for DM */
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +1 -1
@@ -1209,7 +1209,7 @@ int rtw_check_bcn_info(struct adapter *Adapter, u8 *pframe, u32 packet_len) bssid->ssid.ssid_length = ssid_len;if (memcmp (bssid->ssid.ssid, cur_network->network.ssid.ssid,32 ) || - bssid->ssid.ssid_length != cur_network->network.ssid.ssid_length) + bssid->ssid.ssid_length != cur_network->network.ssid.ssid_length)if (bssid->ssid.ssid[0 ] !='\0' && bssid->ssid.ssid_length !=0 )/* not hidden ssid */ goto _mismatch;
drivers/staging/rtl8723bs/core/rtw_xmit.c +10 -10
@@ -407,7 +407,7 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *u8 HTOpMode = pmlmeinfo->HT_protection;if ((pmlmeext->cur_bwmode && (HTOpMode ==2 || HTOpMode ==3 )) || - (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { + (!pmlmeext->cur_bwmode && HTOpMode ==3 )) { pattrib->vcs_mode =RTS_CTS ;break ; }
@@ -564,7 +564,7 @@ static s32 update_attrib_sec_info(struct adapter *padapter, struct pkt_attrib *pmemcpy (pattrib->dot118021x_UncstKey.skey, psta->dot118021x_UncstKey.skey,16 );if (pattrib->encrypt && - ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) + ((padapter->securitypriv.sw_encrypt) || (!psecuritypriv->hw_decrypted))) pattrib->bswenc = true;else pattrib->bswenc = false;
@@ -653,7 +653,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pmemcpy (pattrib->src, ðerhdr.h_source,ETH_ALEN );if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || - (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { + (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) {memcpy (pattrib->ra, pattrib->dst,ETH_ALEN );memcpy (pattrib->ta, pattrib->src,ETH_ALEN ); }else if (check_fwstate (pmlmepriv,WIFI_STATION_STATE )) {
@@ -680,7 +680,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct pif (pktfile.pkt_len >282 ) {/* MINIMUM_DHCP_PACKET_SIZE) { */ if (pattrib->ether_type ==ETH_P_IP ) {/* IP header */ if (((tmp[21 ] ==68 ) && (tmp[23 ] ==67 )) || - ((tmp[21 ] ==67 ) && (tmp[23 ] ==68 ))) { + ((tmp[21 ] ==67 ) && (tmp[23 ] ==68 ))) {/* 68 : UDP BOOTP client */ /* 67 : UDP BOOTP server */ pattrib->dhcp_pkt =1 ;
@@ -1017,7 +1017,7 @@ s32 rtw_txframes_pending(struct adapter *padapter)struct xmit_priv *pxmitpriv = &padapter->xmitpriv;return ((!list_empty (&pxmitpriv->be_pending.queue)) || - (!list_empty (&pxmitpriv->bk_pending.queue)) || + (!list_empty (&pxmitpriv->bk_pending.queue)) || (!list_empty (&pxmitpriv->vi_pending.queue)) || (!list_empty (&pxmitpriv->vo_pending.queue))); }
@@ -1260,7 +1260,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s }else {/* unicast mgmt frame TX */ /* start to encrypt mgmt frame */ if (subtype ==WIFI_DEAUTH || subtype ==WIFI_DISASSOC || - subtype ==WIFI_REASSOCREQ || subtype ==WIFI_ACTION ) { + subtype ==WIFI_REASSOCREQ || subtype ==WIFI_ACTION ) {if (pattrib->psta) psta = pattrib->psta;else
@@ -1274,7 +1274,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s/* according 802.11-2012 standard, these five types are not robust types */ if (subtype == WIFI_ACTION && - (pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC || + (pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC || pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_HT || pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_UNPROTECTED_WNM || pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_SELF_PROTECTED ||
@@ -1435,7 +1435,7 @@ void rtw_count_tx_stats(struct adapter *padapter, struct xmit_frame *pxmitframe, }static struct xmit_buf *__rtw_alloc_cmd_xmitbuf (struct xmit_priv *pxmitpriv, -enum cmdbuf_type buf_type) +enum cmdbuf_type buf_type) {struct xmit_buf *pxmitbuf =NULL ;
@@ -1456,7 +1456,7 @@ static struct xmit_buf *__rtw_alloc_cmd_xmitbuf(struct xmit_priv *pxmitpriv, }struct xmit_frame *__rtw_alloc_cmdxmitframe (struct xmit_priv *pxmitpriv, -enum cmdbuf_type buf_type) +enum cmdbuf_type buf_type) {struct xmit_frame *pcmdframe;struct xmit_buf *pxmitbuf;
@@ -2486,7 +2486,7 @@ struct xmit_buf *dequeue_pending_xmitbuf_under_survey(struct xmit_priv *pxmitpri type =GetFrameSubType (pxmitbuf->pbuf +TXDESC_OFFSET );if ((type ==WIFI_PROBEREQ ) || - (type ==WIFI_DATA_NULL ) || + (type ==WIFI_DATA_NULL ) || (type ==WIFI_QOS_DATA_NULL )) {list_del_init (&pxmitbuf->list);break ;
Signature · 1 line
2.53.0
PATCH 5/11 staging: rtl8723bs: hal: align parameters with open parenthesis
In reply to [email protected]From: Luka Gejak <[email protected]>
Align function parameters with the open parenthesis in the hal directory to adhere to the Linux kernel coding style. This resolves "Alignment should match open parenthesis" warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 2 +- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 2 +- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 8 ++++---- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +1 -1
@@ -1870,7 +1870,7 @@ static void halbtc8723b1ant_ActionWifiConnected(struct btc_coexist *pBtCoexist) (pCoexDm->btStatus == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY) ) { halbtc8723b1ant_ActionBtScoHidOnlyBusy(pBtCoexist, - BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE); + BT_8723B_1ANT_WIFI_STATUS_CONNECTED_IDLE); } else {halbtc8723b1ant_PsTdma (pBtCoexist,NORMAL_EXEC , false,8 );
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +1 -1
@@ -566,7 +566,7 @@ static void halbtc8723b2ant_DacSwing(if (!bForceExec) {if ((pCoexDm->bPreDacSwingOn == pCoexDm->bCurDacSwingOn) && - (pCoexDm->preDacSwingLvl == pCoexDm->curDacSwingLvl)) + (pCoexDm->preDacSwingLvl == pCoexDm->curDacSwingLvl))return ; }mdelay (30 );
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +4 -4
@@ -222,7 +222,7 @@ void ODM_TxPwrTrackSetPwr_8723B( Final_CCK_Swing_Index =0 ;setIqkMatrix_8723B (pDM_Odm, Final_OFDM_Swing_Index, RFPath, - pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], + pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][1 ]);setCCKFilterCoefficient (pDM_Odm, Final_CCK_Swing_Index);
@@ -235,7 +235,7 @@ void ODM_TxPwrTrackSetPwr_8723B( pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index - PwrTrackingLimit_OFDM;setIqkMatrix_8723B (pDM_Odm, PwrTrackingLimit_OFDM, RFPath, - pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], + pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][1 ]); pDM_Odm->Modify_TxAGC_Flag_PathA = true;
@@ -245,7 +245,7 @@ void ODM_TxPwrTrackSetPwr_8723B( pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index;setIqkMatrix_8723B (pDM_Odm,0 , RFPath, - pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], + pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][1 ]); pDM_Odm->Modify_TxAGC_Flag_PathA = true;
@@ -253,7 +253,7 @@ void ODM_TxPwrTrackSetPwr_8723B(PHY_SetTxPowerIndexByRateSection (Adapter, RFPath, pHalData->CurrentChannel,HT_MCS0_MCS7 ); }else {setIqkMatrix_8723B (pDM_Odm, Final_OFDM_Swing_Index, RFPath, - pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], + pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][0 ], pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][1 ]);if (pDM_Odm->Modify_TxAGC_Flag_PathA) {/* If TxAGC has changed, reset TxAGC again */
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +1 -1
@@ -426,7 +426,7 @@ void PHY_SetTxPowerIndexByRateSection(u8 cckRates[] = {MGN_1M ,MGN_2M ,MGN_5_5M ,MGN_11M };PHY_SetTxPowerIndexByRateArray (padapter, RFPath, - pHalData->CurrentChannelBW, + pHalData->CurrentChannelBW, Channel, cckRates,ARRAY_SIZE (cckRates));
drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c +1 -1
@@ -128,7 +128,7 @@ static void update_recvframe_phyinfo(union recv_frame *precvframe,/* rtl8723b_query_rx_phy_status(precvframe, pphy_status); */ /* spin_lock_bh(&p_hal_data->odm_stainfo_lock); */ odm_phy_status_query (&p_hal_data->odmpriv, p_phy_info, - (u8 *)pphy_status, &(pkt_info)); + (u8 *)pphy_status, &(pkt_info));if (psta) psta->rssi = pattrib->phy_info.RecvSignalPower;/* spin_unlock_bh(&p_hal_data->odm_stainfo_lock); */
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -1
@@ -232,7 +232,7 @@ static s32 xmit_xmitframes(struct adapter *padapter, struct xmit_priv *pxmitpriv/* check xmit_buf size enough or not */ txlen = txdesc_size +rtw_wlan_pkt_size (pxmitframe);if (!pxmitbuf || - ((_RND (pxmitbuf->len,8 ) + txlen) > max_xmit_len) || + ((_RND (pxmitbuf->len,8 ) + txlen) > max_xmit_len) || (k >= (rtw_hal_sdio_max_txoqt_free_space (padapter) -1 )) ) {if (pxmitbuf) {
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -1
@@ -743,7 +743,7 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)invalidate_cam_all (padapter);rtw_hal_set_chnl_bw (padapter, padapter->registrypriv.channel, -CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ); +CHANNEL_WIDTH_20 ,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,HAL_PRIME_CHNL_OFFSET_DONT_CARE );/* Record original value for template. This is arough data, we can only use the data */ /* for power adjust. The value can not be adjustde according to different power!!! */
Signature · 1 line
2.53.0
PATCH 6/11 staging: rtl8723bs: os_dep: align parameters with open parenthesis
In reply to [email protected]From: Luka Gejak <[email protected]>
Align function parameters with the open parenthesis in the os_dep directory to adhere to the Linux kernel coding style. This resolves "Alignment should match open parenthesis" warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -1
@@ -2305,7 +2305,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev, }static int cfg80211_rtw_change_beacon (struct wiphy *wiphy,struct net_device *ndev, -struct cfg80211_ap_update *info) +struct cfg80211_ap_update *info) {struct adapter *adapter =rtw_netdev_priv (ndev);
Signature · 1 line
2.53.0
PATCH 7/11 staging: rtl8723bs: core: remove blank lines before closing brace
In reply to [email protected]From: Luka Gejak <[email protected]>
Remove empty lines immediately preceding a closing brace in the core directory to adhere to the Linux kernel coding style. This resolves "Blank lines aren't necessary before a close brace" warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/core/rtw_ieee80211.c | 1 - .../staging/rtl8723bs/core/rtw_ioctl_set.c | 3 - drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 60 ------------------- drivers/staging/rtl8723bs/core/rtw_recv.c | 38 ------------ drivers/staging/rtl8723bs/core/rtw_security.c | 3 - 5 files changed, 105 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ieee80211.c +0 -1
@@ -593,7 +593,6 @@ int rtw_get_wapi_ie(u8 *in_ie, uint in_len, u8 *wapi_ie, u16 *wapi_len)if (wapi_len) *wapi_len = in_ie[cnt +1 ] +2 ; - } cnt += in_ie[cnt +1 ] +2 ;/* get next */
drivers/staging/rtl8723bs/core/rtw_ioctl_set.c +0 -3
@@ -120,9 +120,7 @@ u8 rtw_do_join(struct adapter *padapter) pmlmepriv->to_join = false; } } - } - } exit:
@@ -417,7 +415,6 @@ u8 rtw_set_802_11_authentication_mode(struct adapter *padapter, enum ndis_802_11u8 rtw_set_802_11_add_wep (struct adapter *padapter,struct ndis_802_11_wep *wep) { -signed int keyid, res;struct security_priv *psecuritypriv = &(padapter->securitypriv);u8 ret = _SUCCESS;
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -60
403 lines not on this page · raw message
drivers/staging/rtl8723bs/core/rtw_recv.c +0 -38
@@ -73,7 +73,6 @@ signed int _rtw_init_recv_priv(struct recv_priv *precvpriv, struct adapter *pada precvframe->u.hdr.adapter = padapter; precvframe++; - } res =rtw_hal_init_recv_priv (padapter);
@@ -115,7 +114,6 @@ void _rtw_free_recv_priv(struct recv_priv *precvpriv)union recv_frame *_rtw_alloc_recvframe (struct __queue *pfree_recv_queue) { -union recv_frame *precvframe;struct list_head *plist, *phead;struct adapter *padapter;
@@ -185,7 +183,6 @@ int rtw_free_recvframe(union recv_frame *precvframe, struct __queue *pfree_recv_signed int _rtw_enqueue_recvframe (union recv_frame *precvframe,struct __queue *queue) { -struct adapter *padapter = precvframe->u.hdr.adapter;struct recv_priv *precvpriv = &padapter->recvpriv;
@@ -279,7 +276,6 @@ signed int rtw_enqueue_recvbuf(struct recv_buf *precvbuf, struct __queue *queue)list_add_tail (&precvbuf->list,get_list_head (queue));spin_unlock_bh (&queue->lock);return _SUCCESS; - }struct recv_buf *rtw_dequeue_recvbuf (struct __queue *queue)
@@ -299,13 +295,11 @@ struct recv_buf *rtw_dequeue_recvbuf(struct __queue *queue) precvbuf = container_of(plist, struct recv_buf, list);list_del_init (&precvbuf->list); - }spin_unlock_bh (&queue->lock);return precvbuf; - }static void rtw_handle_tkip_mic_err (struct adapter *padapter,u8 bgroup)
@@ -354,7 +348,6 @@ static void rtw_handle_tkip_mic_err(struct adapter *padapter, u8 bgroup)static signed int recvframe_chkmic (struct adapter *adapter,union recv_frame *precvframe) { -signed int i, res = _SUCCESS;u32 datalen;u8 miccode[8 ];
@@ -426,18 +419,15 @@ static signed int recvframe_chkmic(struct adapter *adapter, union recv_frame *p }recvframe_pull_tail (precvframe,8 ); - } exit:return res; - }/* decrypt and set the ivlen, icvlen of the recv_frame */ static union recv_frame *decryptor (struct adapter *padapter,union recv_frame *precv_frame) { -struct rx_pkt_attrib *prxattrib = &precv_frame->u.hdr.attrib;struct security_priv *psecuritypriv = &padapter->securitypriv;union recv_frame *return_packet = precv_frame;
@@ -582,7 +572,6 @@ static signed int recv_decache(union recv_frame *precv_frame, u8 bretry, struct prxcache->tid_rxseq[tid] = seq_ctrl;return _SUCCESS; - }static void process_pwrbit_data (struct adapter *padapter,union recv_frame *precv_frame)
@@ -604,7 +593,6 @@ static void process_pwrbit_data(struct adapter *padapter, union recv_frame *prec/* pstapriv->sta_dz_bitmap |= BIT(psta->aid); */ stop_sta_xmit (padapter, psta); - } }else {if (psta->state &WIFI_SLEEP_STATE ) {
@@ -614,7 +602,6 @@ static void process_pwrbit_data(struct adapter *padapter, union recv_frame *precwakeup_sta_to_xmit (padapter, psta); } } - } }
@@ -715,7 +702,6 @@ static signed int sta2sta_data_frame(struct adapter *adapter, union recv_frame *if ((check_fwstate (pmlmepriv,WIFI_ADHOC_STATE ) == true) || (check_fwstate (pmlmepriv,WIFI_ADHOC_MASTER_STATE ) == true)) { -/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) { ret = _FAIL;
@@ -804,7 +790,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *p (check_fwstate(pmlmepriv, _FW_LINKED) == true || check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) ) { -/* filter packets that SA is myself or multicast or broadcast */ if (!memcmp (myhwaddr, pattrib->src,ETH_ALEN )) { ret = _FAIL;
@@ -822,7 +807,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *pif (is_zero_ether_addr (pattrib->bssid) ||is_zero_ether_addr (mybssid) || (memcmp (pattrib->bssid, mybssid,ETH_ALEN ))) { -if (!bmcast)issue_deauth (adapter, pattrib->bssid,WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA );
@@ -874,7 +858,6 @@ static signed int ap2sta_data_frame(struct adapter *adapter, union recv_frame *pif (!memcmp (myhwaddr, pattrib->dst,ETH_ALEN ) && (!bmcast)) { *psta =rtw_get_stainfo (pstapriv, pattrib->bssid);/* get sta_info */ if (!*psta) { -/* for AP multicast issue , modify by yiwei */ static unsigned long send_issue_deauth_time;
@@ -1067,7 +1050,6 @@ static signed int validate_recv_ctrl_frame(struct adapter *padapter, union recv_ }return _FAIL; - }/* perform defrag */
@@ -1139,7 +1121,6 @@ static union recv_frame *recvframe_defrag(struct adapter *adapter, pfhdr->attrib.icv_len = pnfhdr->attrib.icv_len; plist =get_next (plist); - }/* free the defrag_q queue and return the prframe */
@@ -1212,7 +1193,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union rertw_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; } - }if ((ismfrag ==0 ) && (fragnum !=0 )) {
@@ -1233,7 +1213,6 @@ static union recv_frame *recvframe_chk_defrag(struct adapter *padapter, union rertw_free_recvframe (precv_frame, pfree_recv_queue); prtnframe =NULL ; } - }
@@ -1287,7 +1266,6 @@ static signed int validate_recv_mgnt_frame(struct adapter *padapter, union recv_mgt_dispatcher (padapter, precv_frame);return _SUCCESS; - }static signed int validate_recv_data_frame (struct adapter *adapter,union recv_frame *precv_frame)
@@ -1343,7 +1321,6 @@ static signed int validate_recv_data_frame(struct adapter *adapter, union recv_fdefault : ret = _FAIL;break ; - }if (ret == _FAIL || ret ==RTW_RX_HANDLED )
@@ -1475,7 +1452,6 @@ static signed int validate_80211w_mgmt(struct adapter *adapter, union recv_frame validate_80211w_fail:return _FAIL; - }static signed int validate_recv_frame (struct adapter *adapter,union recv_frame *precv_frame)
@@ -1735,7 +1711,6 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe) pdata = prframe->u.hdr.rx_data;while (a_len >ETH_HLEN ) { -/* Offset 12 denote 2 mac address */ nSubframe_Length =get_unaligned_be16 (pdata +12 );
@@ -1843,7 +1818,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, unreturn false; else break; - }
@@ -1858,7 +1832,6 @@ static int enqueue_reorder_recvframe(struct recv_reorder_ctrl *preorder_ctrl, un/* spin_unlock_irqrestore(&ppending_recvframe_queue->lock, irql); */ return true; - }static int rtw_recv_indicatepkt (struct adapter *padapter,union recv_frame *precv_frame)
@@ -1926,13 +1899,11 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor pattrib = &prframe->u.hdr.attrib; preorder_ctrl->indicate_seq = pattrib->seq_num; - }/* Prepare indication list and indication. */ /* Check if there is any packet need indicate. */ while (!list_empty (phead)) { - prframe = (union recv_frame *)plist; pattrib = &prframe->u.hdr.attrib;
@@ -1970,7 +1941,6 @@ static int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reor bPktInBuf = true;break ; } - }/* spin_unlock(&ppending_recvframe_queue->lock); */
@@ -1995,11 +1965,9 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame * (padapter->bSurpriseRemoved == false)) {rtw_recv_indicatepkt (padapter, prframe);return _SUCCESS; - }return _FAIL; - }if (preorder_ctrl->enable == false) {
@@ -2083,7 +2051,6 @@ void rtw_reordering_ctrl_timeout_handler(struct timer_list *t)_set_timer (&preorder_ctrl->reordering_ctrl_timer,REORDER_WAIT_TIME );spin_unlock_bh (&ppending_recvframe_queue->lock); - }static int process_recv_indicatepkts (struct adapter *padapter,union recv_frame *prframe)
@@ -2117,11 +2084,9 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame retval = _FAIL;return retval; } - }return retval; - }static int recv_func_prehandle (struct adapter *padapter,union recv_frame *rframe)
@@ -2195,7 +2160,6 @@ static int recv_func(struct adapter *padapter, union recv_frame *rframe) ret =recv_func_prehandle (padapter, rframe);if (ret == _SUCCESS) { -/* check if need to enqueue into uc_swdec_pending_queue*/ if (check_fwstate(mlmepriv, WIFI_STATION_STATE) && !is_multicast_ether_addr(prxattrib->ra) && prxattrib->encrypt > 0 &&
@@ -2263,7 +2227,6 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t) adapter->recvpriv.signal_strength = adapter->recvpriv.signal_strength_dbg; adapter->recvpriv.rssi = (s8 )translate_percentage_to_dbm ((u8 )adapter->recvpriv.signal_strength_dbg); }else { -if (recvpriv->signal_strength_data.update_req ==0 ) {/* update_req is clear, means we got rx */ avg_signal_strength = recvpriv->signal_strength_data.avg_val; num_signal_strength = recvpriv->signal_strength_data.total_num;
@@ -2316,5 +2279,4 @@ static void rtw_signal_stat_timer_hdl(struct timer_list *t) set_timer:rtw_set_signal_stat_timer (recvpriv); - }
drivers/staging/rtl8723bs/core/rtw_security.c +0 -3
@@ -123,7 +123,6 @@ void rtw_wep_decrypt(struct adapter *padapter, u8 *precvframe)/* calculate icv and compare the icv */ *((u32 *)crc) = ~crc32_le (~0 , payload, length -4 ); - } }
@@ -198,7 +197,6 @@ void rtw_secgetmic(struct mic_data *pmicdata, u8 *dst)void rtw_seccalctkipmic (u8 *key,u8 *header,u8 *data,u32 data_len,u8 *mic_code,u8 pri) { -struct mic_data micdata;u8 priority[4 ] = {0x0 ,0x0 ,0x0 ,0x0 };
@@ -450,7 +448,6 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)/* 4 start to encrypt each fragment */ if (pattrib->encrypt == _TKIP_) { - {if (is_multicast_ether_addr (pattrib->ra)) prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
Signature · 1 line
2.53.0
PATCH 8/11 staging: rtl8723bs: hal: remove blank lines before closing brace
In reply to [email protected]From: Luka Gejak <[email protected]>
Remove empty lines immediately preceding a closing brace in the hal directory to adhere to the Linux kernel coding style. This resolves "Blank lines aren't necessary before a close brace" warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 8 -------- drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 2 -- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 1 - drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 12 ------------ drivers/staging/rtl8723bs/hal/hal_com.c | 5 ----- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 2 -- drivers/staging/rtl8723bs/hal/odm.c | 10 ---------- drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 ----- .../staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 1 - drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 7 ------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 6 ------ drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 ---- drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- drivers/staging/rtl8723bs/hal/sdio_ops.c | 1 - 18 files changed, 79 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c +0 -8
@@ -236,7 +236,6 @@ static void halbtc8723b1ant_LimitedRx(/* real update aggregation setting */ pBtCoexist->fBtcSet (pBtCoexist,BTC_SET_ACT_AGGREGATE_CTRL ,NULL ); - }static void halbtc8723b1ant_QueryBtInfo (struct btc_coexist *pBtCoexist)
@@ -368,7 +367,6 @@ static void halbtc8723b1ant_MonitorWiFiCtr(struct btc_coexist *pBtCoexist) }if (!pCoexSta->bPreCCKLock) { -if (nCCKLockCounter >=5 ) pCoexSta->bCCKLock = true;else
@@ -382,7 +380,6 @@ static void halbtc8723b1ant_MonitorWiFiCtr(struct btc_coexist *pBtCoexist) pCoexSta->bPreCCKLock = pCoexSta->bCCKLock; - }static bool halbtc8723b1ant_IsWifiStatusChanged (struct btc_coexist *pBtCoexist)
@@ -585,7 +582,6 @@ static u8 halbtc8723b1ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) ) {if (!bBtHsOn) algorithm =BT_8723B_1ANT_COEX_ALGO_PANEDR_HID ; - } } }
@@ -914,13 +910,11 @@ static void halbtc8723b1ant_SetAntPath( pBtCoexist->fBtcWrite1ByteBitMask (pBtCoexist,0x64 ,0x1 ,0x0 );if (pBoardInfo->btdmAntPos ==BTC_ANTENNA_AT_MAIN_PORT ) { -/* tell firmware "no antenna inverse" */ H2C_Parameter[0 ] =0 ; H2C_Parameter[1 ] =0 ;/* internal switch type */ pBtCoexist->fBtcFillH2c (pBtCoexist,0x65 ,2 , H2C_Parameter); }else { -/* tell firmware "antenna inverse" */ H2C_Parameter[0 ] =1 ; H2C_Parameter[1 ] =0 ;/* internal switch type */
@@ -1234,7 +1228,6 @@ static void halbtc8723b1ant_PsTdma(break ; } }else { -/* disable PS tdma */ switch (type) {case 8 :/* PTA Control */
@@ -1912,7 +1905,6 @@ static void halbtc8723b1ant_RunSwCoexistMechanism(struct btc_coexist *pBtCoexist pCoexDm->curAlgorithm = algorithm;if (halbtc8723b1ant_IsCommonAction (pBtCoexist)) { - }else {switch (pCoexDm->curAlgorithm) {case BT_8723B_1ANT_COEX_ALGO_SCO :
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +0 -2
@@ -1579,7 +1579,6 @@ static void halbtc8723b2ant_TdmaDurationAdjust(if (!bScan && !bLink && !bRoam)halbtc8723b2ant_PsTdma (pBtCoexist,NORMAL_EXEC , true, pCoexDm->psTdmaDuAdjType); - } }
@@ -2483,7 +2482,6 @@ void EXhalbtc8723b2ant_BtInfoNotify( pCoexSta->btInfoC2h[rspSource][i] = tmpBuf[i];if (i ==1 ) btInfo = tmpBuf[i]; - }if (pBtCoexist->bManualControl) {
drivers/staging/rtl8723bs/hal/HalPhyRf.c +0 -1
@@ -57,7 +57,6 @@ void ODM_ClearTxPowerTrackingState(struct dm_odm_t *pDM_Odm)void ODM_TXPowerTrackingCallback_ThermalMeter (struct adapter *Adapter) { -struct hal_com_data *pHalData =GET_HAL_DATA (Adapter);struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -12
@@ -172,7 +172,6 @@ void ODM_TxPwrTrackSetPwr_8723B( TxRate =HwRateToMRate (pDM_Odm->TxRate); }else /* force rate */ TxRate = (u8 )rate; - }if (TxRate !=0xFF ) {
@@ -978,7 +977,6 @@ static void _PHY_PathAFillIQKMatrix8723B(PHY_SetBBReg (pDM_Odm->Adapter, rOFDM0_RxIQExtAnta,0xF0000000 , reg); pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][KEY ] = rOFDM0_RxIQExtAnta; pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][VAL ] =PHY_QueryBBReg (pDM_Odm->Adapter, rOFDM0_RxIQExtAnta, bMaskDWord); - } }
@@ -1064,7 +1062,6 @@ static void _PHY_PathBFillIQKMatrix8723B(void ODM_SetIQCbyRFpath (struct dm_odm_t *pDM_Odm,u32 RFpath) { -struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo;u8 path;
@@ -1126,7 +1123,6 @@ static void _PHY_SaveMACRegisters8723B( MACBackup[i] =rtw_read8 (pDM_Odm->Adapter, MACReg[i]); } MACBackup[i] =rtw_read32 (pDM_Odm->Adapter, MACReg[i]); - }
@@ -1181,7 +1177,6 @@ static void _PHY_PathADDAOn8723B(for (i =1 ; i <IQK_ADDA_REG_NUM ; i++) {PHY_SetBBReg (pDM_Odm->Adapter, ADDAReg[i], bMaskDWord, pathOn); } - } static void _PHY_MACSettingCalibration8723B(
@@ -1198,7 +1193,6 @@ static void _PHY_MACSettingCalibration8723B(rtw_write8 (pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i] & (~BIT3 ))); }rtw_write8 (pDM_Odm->Adapter, MACReg[i], (u8)(MACBackup[i] & (~BIT5 ))); - } static bool phy_SimularityCompare_8723B(
@@ -1217,7 +1211,6 @@ static bool phy_SimularityCompare_8723B( SimularityBitMap =0 ;for (i =0 ; i < bound; i++) { -if ((i ==1 ) || (i ==3 ) || (i ==5 ) || (i ==7 )) {if ((result[c1][i] &0x00000200 ) !=0 ) tmp1 = result[c1][i] |0xFFFFFC00 ;
@@ -1258,7 +1251,6 @@ static bool phy_SimularityCompare_8723B( }return bResult; }else { -if (!(SimularityBitMap &0x03 )) {/* path A TX OK */ for (i =0 ; i <2 ; i++) result[3 ][i] = result[c1][i];
@@ -1344,7 +1336,6 @@ static void phy_IQCalibrate_8723B(/* u32 bbvalue; */ if (t ==0 ) { -/* Save ADDA parameters, turn Path A ADDA on */ _PHY_SaveADDARegisters8723B (padapter,ADDA_REG , pDM_Odm->RFCalibrateInfo.ADDA_backup,IQK_ADDA_REG_NUM );_PHY_SaveMACRegisters8723B (padapter,IQK_MAC_REG , pDM_Odm->RFCalibrateInfo.IQK_MAC_backup);
@@ -1420,7 +1411,6 @@ static void phy_IQCalibrate_8723B(/* path B IQK */ if (is2T) { -/* path B TX IQK */ for (i =0 ; i < retryCount ; i++) { PathBOK =phy_PathB_IQK_8723B (padapter);
@@ -1478,9 +1468,7 @@ static void phy_IQCalibrate_8723B(/* load 0xe30 IQC default value */ PHY_SetBBReg (pDM_Odm->Adapter, rTx_IQK_Tone_A, bMaskDWord,0x01008c00 );PHY_SetBBReg (pDM_Odm->Adapter, rRx_IQK_Tone_A, bMaskDWord,0x01008c00 ); - } - }
drivers/staging/rtl8723bs/hal/hal_com.c +0 -5
@@ -294,7 +294,6 @@ void HalSetBrateCfg(struct adapter *Adapter, u8 *mBratesOS, u16 *pBrateCfg)u8 i, is_brate, brate;for (i =0 ; i <NDIS_802_11_LENGTH_RATES_EX ; i++) { - is_brate = mBratesOS[i] &IEEE80211_BASIC_RATE_MASK ; brate = mBratesOS[i] &0x7f ;
@@ -392,9 +391,7 @@ static void _TwoOutPipeMapping(struct adapter *padapter, bool bWIFICfg) pdvobjpriv->Queue2Pipe[5 ] = pdvobjpriv->RtOutPipe[0 ];/* MGT */ pdvobjpriv->Queue2Pipe[6 ] = pdvobjpriv->RtOutPipe[0 ];/* HIGH */ pdvobjpriv->Queue2Pipe[7 ] = pdvobjpriv->RtOutPipe[0 ];/* TXCMD */ - } - }static void _ThreeOutPipeMapping (struct adapter *padapter,bool bWIFICfg)
@@ -434,7 +431,6 @@ static void _ThreeOutPipeMapping(struct adapter *padapter, bool bWIFICfg) pdvobjpriv->Queue2Pipe[6 ] = pdvobjpriv->RtOutPipe[0 ];/* HIGH */ pdvobjpriv->Queue2Pipe[7 ] = pdvobjpriv->RtOutPipe[0 ];/* TXCMD */ } - }bool Hal_MappingOutPipe (struct adapter *padapter,u8 NumOutPipe)
@@ -462,7 +458,6 @@ bool Hal_MappingOutPipe(struct adapter *padapter, u8 NumOutPipe) }return result; - }void hal_init_macaddr (struct adapter *adapter)
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +0 -2
@@ -445,7 +445,6 @@ void PHY_SetTxPowerIndexByRateSection( pHalData->CurrentChannelBW, Channel, htRates1T, ARRAY_SIZE(htRates1T)); - } }
@@ -590,7 +589,6 @@ s8 PHY_GetTxPowerByRate(struct adapter *padapter, u8 RFPath, u8 Rate)return value;return pHalData->TxPwrByRateOffset[RFPath][rateIndex]; - } void PHY_SetTxPowerByRate(
drivers/staging/rtl8723bs/hal/odm.c +0 -10
@@ -249,7 +249,6 @@ u32 ODM_Get_Rate_Bitmap( }return ra_mask & rate_bitmap; - }static void odm_RefreshRateAdaptiveMaskCE (struct dm_odm_t *pDM_Odm)
@@ -273,7 +272,6 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)if (true ==ODM_RAStateCheck (pDM_Odm, pstat->rssi_stat.UndecoratedSmoothedPWDB, false, &pstat->rssi_level)) {rtw_hal_update_ra_mask (pstat, pstat->rssi_level); } - } } }
@@ -297,7 +295,6 @@ static void odm_RefreshRateAdaptiveMaskCE(struct dm_odm_t *pDM_Odm)*/ static void odm_RefreshRateAdaptiveMask (struct dm_odm_t *pDM_Odm) { -if (!(pDM_Odm->SupportAbility &ODM_BB_RA_MASK ))return ;
@@ -369,7 +366,6 @@ static void odm_RSSIMonitorInit(struct dm_odm_t *pDM_Odm)struct ra_t *pRA_Table = &pDM_Odm->DM_RA_Table; pRA_Table->firstconnect = false; - }static void FindMinimumRSSI (struct adapter *padapter)
@@ -543,7 +539,6 @@ void odm_TXPowerTrackingInit(struct dm_odm_t *pDM_Odm) pDM_Odm->RFCalibrateInfo.DeltaPowerIndexLast[p] =0 ; pDM_Odm->RFCalibrateInfo.PowerIndexOffset[p] =0 ; } - }void ODM_TXPowerTrackingCheck (struct dm_odm_t *pDM_Odm)
@@ -573,7 +568,6 @@ void ODM_TXPowerTrackingCheck(struct dm_odm_t *pDM_Odm)/* */ void ODM_DMInit (struct dm_odm_t *pDM_Odm) { -odm_CommonInfoSelfInit (pDM_Odm);odm_DIGInit (pDM_Odm);odm_NHMCounterStatisticsInit (pDM_Odm);
@@ -732,7 +726,6 @@ void ODM_CmnInfoInit(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, u32 V/* do nothing */ break ; } - }
@@ -856,7 +849,6 @@ void ODM_CmnInfoHook(struct dm_odm_t *pDM_Odm, enum odm_cmninfo_e CmnInfo, void/* do nothing */ break ; } - }
@@ -882,7 +874,6 @@ void ODM_CmnInfoPtrArrayHook(/* do nothing */ break ; } - }
@@ -985,7 +976,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value)break ; } - }/* 3 ============================================================ */
drivers/staging/rtl8723bs/hal/odm_DIG.c +0 -5
@@ -293,7 +293,6 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI)if (!pDM_DigTable->bPSDInProgress) {if (CurrentIGI > pDM_DigTable->rx_gain_range_max) CurrentIGI = pDM_DigTable->rx_gain_range_max; - }/* 1 Set IGI value */
@@ -303,7 +302,6 @@ void ODM_Write_DIG(void *pDM_VOID, u8 CurrentIGI) pDM_DigTable->CurIGValue = CurrentIGI; } - }bool odm_DigAbort (void *pDM_VOID)
@@ -477,7 +475,6 @@ void odm_DIG(void *pDM_VOID)/* 1 Adjust initial gain by false alarm */ if (pDM_Odm->bLinked && bPerformance) { -if (bFirstTpTarget || FirstConnect) { pDM_DigTable->LargeFAHit =0 ;
@@ -506,7 +503,6 @@ void odm_DIG(void *pDM_VOID) } } }else { -if (FirstDisConnect || bFirstCoverage) { CurrentIGI = dm_dig_min; }else {
@@ -754,7 +750,6 @@ u8 odm_ForbiddenIGICheck(void *pDM_VOID, u8 DIG_Dynamic_MIN, u8 CurrentIGI) }return rx_gain_range_min; - }/* 3 ============================================================ */
drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c +0 -1
@@ -33,7 +33,6 @@ void ODM_RF_Saving(void *pDM_VOID, u8 bForceInNormal) }if (pDM_PSTable->initialize ==0 ) { - pDM_PSTable->Reg874 = (PHY_QueryBBReg (pDM_Odm->Adapter,0x874 , bMaskDWord) &0x1CC000 ) >>14 ; pDM_PSTable->RegC70 = (PHY_QueryBBReg (pDM_Odm->Adapter,0xc70 , bMaskDWord) &BIT3 ) >>3 ; pDM_PSTable->Reg85C = (PHY_QueryBBReg (pDM_Odm->Adapter,0x85c , bMaskDWord) &0xFF000000 ) >>24 ;
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +0 -7
@@ -18,7 +18,6 @@ static u8 odm_query_rx_pwr_percentage(s8 ant_power)return 100 ; else return 100 + ant_power; - }s32 odm_signal_scale_mapping (struct dm_odm_t *dm_odm,s32 curr_sig)
@@ -162,7 +161,6 @@ static void odm_rx_phy_status_parsing(struct dm_odm_t *dm_odm, sq =100 ; else sq = ((64 - sq_rpt) *100 ) /44 ; - } phy_info->signal_quality = sq;
@@ -250,7 +248,6 @@ static void odm_Process_RSSIForDM( struct dm_odm_t *pDM_Odm, struct odm_phy_info *pPhyInfo, struct odm_packet_info *pPktinfo ) { - s32 UndecoratedSmoothedPWDB, UndecoratedSmoothedCCK, UndecoratedSmoothedOFDM, RSSI_Ave;u8 isCCKrate =0 ;u8 RSSI_max, RSSI_min, i;
@@ -278,7 +275,6 @@ static void odm_Process_RSSIForDM(/* Statistic for antenna/path diversity------------------ */ if (pDM_Odm->SupportAbility &ODM_BB_ANT_DIV ) { - }/* Smart Antenna Debug Message------------------ */
@@ -288,7 +284,6 @@ static void odm_Process_RSSIForDM( UndecoratedSmoothedPWDB = pEntry->rssi_stat.UndecoratedSmoothedPWDB;if (pPktinfo->to_self || pPktinfo->is_beacon) { -if (!isCCKrate) {/* ofdm rate */ if (pPhyInfo->rx_mimo_signal_strength[RF_PATH_B ] ==0 ) { RSSI_Ave = pPhyInfo->rx_mimo_signal_strength[RF_PATH_A ];
@@ -385,7 +380,6 @@ static void odm_Process_RSSIForDM( pEntry->rssi_stat.UndecoratedSmoothedOFDM = UndecoratedSmoothedOFDM; pEntry->rssi_stat.UndecoratedSmoothedPWDB = UndecoratedSmoothedPWDB; } - } }
@@ -396,7 +390,6 @@ static void odm_Process_RSSIForDM(void odm_phy_status_query (struct dm_odm_t *dm_odm,struct odm_phy_info *phy_info,u8 *phy_status,struct odm_packet_info *pkt_info) { -odm_rx_phy_status_parsing (dm_odm, phy_info, phy_status, pkt_info);if (!dm_odm->RSSI_test)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +0 -6
@@ -31,7 +31,6 @@ static u8 _is_fw_read_cmd_down(struct adapter *padapter, u8 msgbox_num) }while ((!read_down) && (retry_cnts--));return read_down; - }
@@ -188,7 +187,6 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)return ; *pLength = pktlen; - }static void ConstructPSPoll (struct adapter *padapter,u8 *pframe,u32 *pLength)
@@ -416,12 +414,10 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)/* reset adaptive_early_32k cnt */ pmlmeext->bcn_delay_cnt[i] =0 ; pmlmeext->bcn_delay_ratio[i] =0 ; - } pmlmeext->bcn_cnt =0 ; pmlmeext->adaptive_tsf_done = true; - }/* offload to FW if fw version > v15.10
@@ -431,7 +427,6 @@ void rtl8723b_set_FwPwrMode_cmd(struct adapter *padapter, u8 psmode)if ((pmlmeext->DrvBcnEarly!= 0Xff) && (pmlmeext->DrvBcnTimeOut!= 0xff)) u1H2CPwrModeParm[H2C_PWRMODE_LEN-1] = BIT(0) | ((pmlmeext->DrvBcnEarly<<1)&0x0E) |((pmlmeext->DrvBcnTimeOut<<4)&0xf0) ; */ - }hal_btcoex_RecordPwrMode (padapter, u1H2CPwrModeParm,H2C_PWRMODE_LEN );
@@ -458,7 +453,6 @@ void rtl8723b_set_FwPsTuneParam_cmd(struct adapter *padapter)void rtl8723b_set_FwPwrModeInIPS_cmd (struct adapter *padapter,u8 cmd_param) { -FillH2CCmd8723B (padapter,H2C_8723B_FWLPS_IN_IPS_ ,1 , &cmd_param); }
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +0 -3
@@ -17,7 +17,6 @@/* */ static void Init_ODM_ComInfo_8723b (struct adapter *Adapter) { -struct hal_com_data *pHalData =GET_HAL_DATA (Adapter);struct dm_odm_t *pDM_Odm = &pHalData->odmpriv;struct dm_priv *pdmpriv = &pHalData->dmpriv;
@@ -193,7 +192,6 @@ void rtl8723b_hal_dm_in_lps(struct adapter *padapter)rtl8723b_set_rssi_cmd (padapter, (u8 *)&PWDB_rssi); } - }void rtl8723b_HalDmWatchDog_in_LPS (struct adapter *Adapter)
@@ -251,7 +249,6 @@ void rtl8723b_HalDmWatchDog_in_LPS(struct adapter *Adapter) skip_lps_dm:return ; - }void rtl8723b_init_dm_priv (struct adapter *Adapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
@@ -785,7 +785,6 @@ static void hal_ReadEFuse_BT(if ((eFuse_Addr -1 ) < total)break ; - }/* switch bank back to bank 0 for later BT and wifi use. */
@@ -1959,7 +1958,6 @@ static void hw_var_set_opmode(struct adapter *padapter, u8 variable, u8 *val)ResumeTxBeacon (padapter);rtw_write8 (padapter,REG_BCN_CTRL ,DIS_TSF_UDT |EN_BCN_FUNCTION |DIS_BCNQ_SUB ); }else if (mode == _HW_STATE_AP_) { -ResumeTxBeacon (padapter);rtw_write8 (padapter,REG_BCN_CTRL ,DIS_TSF_UDT |DIS_BCNQ_SUB );
@@ -2207,7 +2205,6 @@ static void hw_var_set_mlme_join(struct adapter *padapter, u8 variable, u8 *val)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)
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -4
@@ -46,7 +46,6 @@ u32 PHY_QueryBBReg_8723B(struct adapter *Adapter, u32 RegAddr, u32 BitMask) BitShift =phy_CalculateBitShift (BitMask);return (OriginalValue & BitMask) >> BitShift; - }
@@ -80,7 +79,6 @@ void PHY_SetBBReg_8723B( }rtw_write32 (Adapter, RegAddr, Data); - }
@@ -141,7 +139,6 @@ static u32 phy_RFSerialRead_8723B( retValue =PHY_QueryBBReg (Adapter, pPhyReg->rfLSSIReadBack | MaskforPhySet, bLSSIReadBackData); }return retValue; - }/**
@@ -329,7 +326,6 @@ static void phy_InitBBRFRegisterDefinition(struct adapter *Adapter) pHalData->PHYRegDef[RF_PATH_B ].rfLSSIReadBack = rFPGA0_XB_LSSIReadBack; pHalData->PHYRegDef[RF_PATH_A ].rfLSSIReadBackPi = TransceiverA_HSPI_Readback; pHalData->PHYRegDef[RF_PATH_B ].rfLSSIReadBackPi = TransceiverB_HSPI_Readback; - }static int phy_BB8723b_Config_ParaFile (struct adapter *Adapter)
drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c +0 -3
@@ -76,7 +76,6 @@ void PHY_RF6052SetBandwidth8723B(default :break ; } - }static int phy_RF6052_Config_ParaFile (struct adapter *Adapter)
@@ -91,7 +90,6 @@ static int phy_RF6052_Config_ParaFile(struct adapter *Adapter)/* 3----------------------------------------------------------------- */ /* for (eRFPath = RF_PATH_A; eRFPath <pHalData->NumTotalRFPath; eRFPath++) */ for (eRFPath =0 ; eRFPath < pHalData->NumTotalRFPath; eRFPath++) { - pPhyReg = &pHalData->PHYRegDef[eRFPath];/*----Store original RFENV control type----*/
@@ -162,7 +160,6 @@ int PHY_RF6052_Config8723B(struct adapter *Adapter)/* Config BB and RF */ /* */ return phy_RF6052_Config_ParaFile (Adapter); - }/* End of HalRf6052.c */
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -1
@@ -520,7 +520,6 @@ s32 rtl8723bs_hal_xmitframe_enqueue( }return err; - }/*
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -5
@@ -232,7 +232,6 @@ static void _InitNormalChipOneOutEpPriority(struct adapter *Adapter)_InitNormalChipRegPriority ( Adapter, value, value, value, value, value, value ); - }static void _InitNormalChipTwoOutEpPriority (struct adapter *Adapter)
@@ -280,7 +279,6 @@ static void _InitNormalChipTwoOutEpPriority(struct adapter *Adapter) }_InitNormalChipRegPriority (Adapter, beQ, bkQ, viQ, voQ, mgtQ, hiQ); - }static void _InitNormalChipThreeOutEpPriority (struct adapter *padapter)
@@ -326,7 +324,6 @@ static void _InitQueuePriority(struct adapter *Adapter)break ; } - }static void _InitPageBoundary (struct adapter *padapter)
@@ -530,7 +527,6 @@ static void _InitOperationMode(struct adapter *padapter) }rtw_write8 (padapter,REG_BWOPMODE , regBwOpMode); - }static void _InitInterrupt (struct adapter *padapter)
@@ -619,7 +615,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* do polling cpwm */ start_time = jiffies; do { - mdelay(1); rtw_hal_get_hwreg(padapter, HW_VAR_CPWM, &cpwm_now);
drivers/staging/rtl8723bs/hal/sdio_ops.c +0 -1
@@ -614,7 +614,6 @@ static u16 sdio_local_cmd52_read2byte(struct adapter *adapter, u32 addr)static u32 sdio_local_cmd53_read4byte (struct adapter *adapter,u32 addr) { -u8 mac_pwr_ctrl_on;u32 val =0 ;struct intf_hdl *intfhdl = &adapter->iopriv.intf;
Signature · 1 line
2.53.0
PATCH 9/11 staging: rtl8723bs: os_dep: remove unnecessary braces
In reply to [email protected]From: Luka Gejak <[email protected]>
Remove unnecessary braces around single-statement blocks in the os_dep directory to adhere to the Linux kernel coding style. This resolves unnecessary braces warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 3 +-- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +1 -2
@@ -1402,9 +1402,8 @@ static int rtw_cfg80211_set_key_mgt(struct security_priv *psecuritypriv, u32 keyif (key_mgt ==WLAN_AKM_SUITE_8021X )/* auth_type = UMAC_AUTH_TYPE_8021X; */ psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; -else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { +else if (key_mgt ==WLAN_AKM_SUITE_PSK ) psecuritypriv->dot11AuthAlgrthm = dot11AuthAlgrthm_8021X; - }return 0 ; }
drivers/staging/rtl8723bs/os_dep/sdio_intf.c +1 -2
@@ -144,9 +144,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.53.0
PATCH 10/11 staging: rtl8723bs: os_dep: remove blank lines before closing braces
In reply to [email protected]From: Luka Gejak <[email protected]>
Remove empty lines immediately preceding a closing brace in the os_dep directory to adhere to the Linux kernel coding style. This resolves "Blank lines aren't necessary before a close brace" warnings reported by checkpatch.pl.
--- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +0 -7
@@ -578,7 +578,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psecuritypriv->dot118021XGrpPrivacy = _WEP40_;if (param->u.crypt.key_len ==13 ) psecuritypriv->dot118021XGrpPrivacy = _WEP104_; - }else if (strcmp (param->u.crypt.alg,"TKIP" ) ==0 ) { psecuritypriv->dot118021XGrpPrivacy = _TKIP_;
@@ -589,7 +588,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); psecuritypriv->busetkipkey = true; - }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) { psecuritypriv->dot118021XGrpPrivacy = _AES_;
@@ -633,7 +631,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (psta->dot11tkiprxmickey.skey, &(param->u.crypt.key[24 ]),8 ); psecuritypriv->busetkipkey = true; - }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) { psta->dot118021XPrivacy = _AES_; }else {
@@ -645,7 +642,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa psta->ieee8021x_blocked = false; psta->bpairwise_key_installed = true; - }else {/* group key??? */ if (strcmp (param->u.crypt.alg,"WEP" ) ==0 ) {memcpy (grpkey, param->u.crypt.key, (param->u.crypt.key_len >16 ?16 : param->u.crypt.key_len));
@@ -663,7 +659,6 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pamemcpy (rxkey, &(param->u.crypt.key[24 ]),8 ); psecuritypriv->busetkipkey = true; - }else if (strcmp (param->u.crypt.alg,"CCMP" ) ==0 ) { psecuritypriv->dot118021XGrpPrivacy = _AES_;
@@ -2048,7 +2043,6 @@ static netdev_tx_t rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struc/* Use the real net device to transmit the packet */ _rtw_xmit_entry (skb, padapter->pnetdev);return NETDEV_TX_OK ; - }else if ((frame_control & (IEEE80211_FCTL_FTYPE |IEEE80211_FCTL_STYPE )) == (IEEE80211_FTYPE_MGMT |IEEE80211_STYPE_ACTION )) {/* only for action frames */
@@ -2503,7 +2497,6 @@ static int _cfg80211_rtw_mgmt_tx(struct adapter *padapter, u8 tx_ch, const u8 *bif (dump_mgntframe_and_wait_ack (padapter, pmgntframe) != _SUCCESS) { ack = false; ret = _FAIL; - }else {msleep (50 );
Signature · 1 line
2.53.0
PATCH 11/11 staging: rtl8723bs: hal: remove unnecessary braces
In reply to [email protected]From: Luka Gejak <[email protected]>
Remove unnecessary braces around single-statement blocks in the hal directory to adhere to the Linux kernel coding style. This resolves unnecessary braces warnings reported by checkpatch.pl.
--- .../staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 137 +++++++----------- drivers/staging/rtl8723bs/hal/HalPhyRf.c | 6 +- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 24 +-- 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 | 6 +- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 3 +- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 49 +++---- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 12 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - 12 files changed, 101 insertions(+), 162 deletions(-)
drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c +56 -81
@@ -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++;
@@ -311,58 +298,54 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist) numOfDiffProfile++;if (numOfDiffProfile ==1 ) { -if (pBtLinkInfo->bScoExist) { +if (pBtLinkInfo->bScoExist) algorithm =BT_8723B_2ANT_COEX_ALGO_SCO ; - }else { -if (pBtLinkInfo->bHidExist) { +else +if (pBtLinkInfo->bHidExist) algorithm =BT_8723B_2ANT_COEX_ALGO_HID ; - }else if (pBtLinkInfo->bA2dpExist) { +else if (pBtLinkInfo->bA2dpExist) algorithm =BT_8723B_2ANT_COEX_ALGO_A2DP ; - }else if (pBtLinkInfo->bPanExist) { -if (bBtHsOn) { +else if (pBtLinkInfo->bPanExist) { +if (bBtHsOn) algorithm =BT_8723B_2ANT_COEX_ALGO_PANHS ; - }else { +else algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR ; - } } } }else if (numOfDiffProfile ==2 ) {if (pBtLinkInfo->bScoExist) { -if (pBtLinkInfo->bHidExist) { +if (pBtLinkInfo->bHidExist) algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - }else if (pBtLinkInfo->bA2dpExist) { +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 ( pBtLinkInfo->bHidExist && pBtLinkInfo->bA2dpExist - ) { + ) algorithm =BT_8723B_2ANT_COEX_ALGO_HID_A2DP ; - }else if ( +else if ( 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 ) {
@@ -370,30 +353,28 @@ static u8 halbtc8723b2ant_ActionAlgorithm(struct btc_coexist *pBtCoexist)if ( pBtLinkInfo->bHidExist && pBtLinkInfo->bA2dpExist - ) { + ) algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - }else if ( +else if ( pBtLinkInfo->bHidExist && pBtLinkInfo->bPanExist - ) { + ) algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - }else if ( +else if ( pBtLinkInfo->bPanExist && pBtLinkInfo->bA2dpExist - ) { + ) algorithm =BT_8723B_2ANT_COEX_ALGO_PANEDR_HID ; - } }else {if ( pBtLinkInfo->bHidExist && 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 +461,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); - } } }
@@ -2201,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)) {
@@ -2225,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) {
@@ -2405,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)
@@ -2484,9 +2460,8 @@ void EXhalbtc8723b2ant_BtInfoNotify( btInfo = tmpBuf[i]; } -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] */
drivers/staging/rtl8723bs/hal/HalPhyRf.c +2 -4
@@ -117,9 +117,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. */
@@ -234,8 +233,7 @@ void ODM_TXPowerTrackingCallback_ThermalMeter(struct adapter *Adapter) }/* Print Swing base & current */ -for (p =RF_PATH_A ; p < c.RfPathCount; p++) { - } +for (p =RF_PATH_A ; p < c.RfPathCount; p++) if ( (pDM_Odm->RFCalibrateInfo.PowerIndexOffset[RF_PATH_A] != 0 ||
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +8 -16
@@ -1105,9 +1105,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); - } }
@@ -1119,9 +1118,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]); }
@@ -1137,9 +1135,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(
@@ -1148,9 +1145,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]); }
@@ -1170,13 +1166,11 @@ static void _PHY_PathADDAOn8723B(if (!is2T) { pathOn =0x01c00014 ;PHY_SetBBReg (pDM_Odm->Adapter, ADDAReg[0 ], bMaskDWord,0x01c00014 ); - }else { + }else 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); - } } static void _PHY_MACSettingCalibration8723B(
@@ -1189,9 +1183,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 ))); }
@@ -1516,9 +1509,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
@@ -1027,15 +1027,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
@@ -324,9 +324,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(
@@ -362,9 +361,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 -3
@@ -269,9 +269,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); - } } } }
@@ -975,7 +974,6 @@ void ODM_CmnInfoUpdate(struct dm_odm_t *pDM_Odm, u32 CmnInfo, u64 Value)/* do nothing */ break ; } - }/* 3 ============================================================ */
drivers/staging/rtl8723bs/hal/odm_HWConfig.c +2 -4
@@ -238,9 +238,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)); - } } }
@@ -274,8 +273,7 @@ static void odm_Process_RSSIForDM( pDM_Odm->RxRate = pPktinfo->data_rate;/* Statistic for antenna/path diversity------------------ */ -if (pDM_Odm->SupportAbility &ODM_BB_ANT_DIV ) { - } +if (pDM_Odm->SupportAbility &ODM_BB_ANT_DIV )/* Smart Antenna Debug Message------------------ */
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 +19 -30
133 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);
@@ -375,9 +374,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 */
@@ -395,9 +393,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; }
@@ -412,9 +409,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/hal/sdio_halinit.c +0 -1
@@ -323,7 +323,6 @@ static void _InitQueuePriority(struct adapter *Adapter)default :break ; } - }static void _InitPageBoundary (struct adapter *padapter)
Signature · 1 line
2.53.0