staging: rtl8723bs: continued cleanup of struct
cover staging: rtl8723bs: continued cleanup of struct
Removal of some fields that are primarily written to but not read.
Nikolay Kulikov (9):
staging: rtl8723bs: remove unused 'CCK_24G_Diff' from hal_com_data
staging: rtl8723bs: remove unused array MCSTxPowerLevelOriginalOffset
staging: rtl8723bs: remove unused 'bIQKInitialized ' from hal_com_data
staging: rtl8723bs: remove unused 'bNeedIQK' from struct hal_com_data
staging: rtl8723bs: hal: remove unused readings from the chip
staging: rtl8723bs: remove unused 'UsbRxHighSpeedMode' from
hal_com_data
staging: rtl8723bs: remove unused spinlock 'SdioTxFIFOFreePageLock'
staging: rtl8723bs: remove 'rf_chip' from struct hal_com_data
staging: rtl8723bs: remove debug fields from hal_com_data
drivers/staging/rtl8723bs/core/rtw_ap.c | 2 -- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 --- drivers/staging/rtl8723bs/hal/hal_com.c | 6 ----- .../staging/rtl8723bs/hal/hal_com_phycfg.c | 13 ----------- drivers/staging/rtl8723bs/hal/hal_sdio.c | 4 ---- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 11 --------- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 -- .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 1 - drivers/staging/rtl8723bs/hal/sdio_halinit.c | 23 ------------------- drivers/staging/rtl8723bs/include/hal_data.h | 18 --------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 11 files changed, 84 deletions(-)
base-commit: cb08dcd0a896c3ac8073a57296f2377b106c35b4
Signature · 1 line
2.55.0
PATCH 1/9 staging: rtl8723bs: remove unused 'CCK_24G_Diff' from hal_com_data
Values are written to this array, but they are never used.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_data.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1311,7 +1311,6 @@ void Hal_EfuseParseTxPowerInfo_8723B( }for (TxCount =0 ; TxCount <MAX_TX_COUNT ; TxCount++) { - pHalData->CCK_24G_Diff[rfPath][TxCount] = pwrInfo24G.CCK_Diff[rfPath][TxCount]; pHalData->OFDM_24G_Diff[rfPath][TxCount] = pwrInfo24G.OFDM_Diff[rfPath][TxCount]; pHalData->BW20_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW20_Diff[rfPath][TxCount]; pHalData->BW40_24G_Diff[rfPath][TxCount] = pwrInfo24G.BW40_Diff[rfPath][TxCount];
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -176,7 +176,6 @@ struct hal_com_data {u8 Index24G_CCK_Base[MAX_RF_PATH ][CHANNEL_MAX_NUMBER ];u8 Index24G_BW40_Base[MAX_RF_PATH ][CHANNEL_MAX_NUMBER ];/* If only one tx, only BW20 and OFDM are used. */ -s8 CCK_24G_Diff[MAX_RF_PATH ][MAX_TX_COUNT ];s8 OFDM_24G_Diff[MAX_RF_PATH ][MAX_TX_COUNT ];s8 BW20_24G_Diff[MAX_RF_PATH ][MAX_TX_COUNT ];s8 BW40_24G_Diff[MAX_RF_PATH ][MAX_TX_COUNT ];
Signature · 1 line
2.55.0
PATCH 2/9 staging: rtl8723bs: remove unused array MCSTxPowerLevelOriginalOffset
In reply to Nikolay KulikovRemove the 'MCSTxPowerLevelOriginalOffset' array and the 'pwrGroupCnt' field (which is used as an index for that array), as values are being written to it but are no longer used.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 13 ------------- drivers/staging/rtl8723bs/include/hal_data.h | 4 ---- 2 files changed, 17 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com_phycfg.c +0 -13
@@ -329,16 +329,6 @@ static void PHY_StoreTxPowerByRateNew(struct adapter *padapter, u32 RfPath, } } -static void PHY_StoreTxPowerByRateOld ( -struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data -) -{ -struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -u8 index =PHY_GetRateSectionIndexOfTxPowerByRate (padapter, RegAddr, BitMask); - - pHalData->MCSTxPowerLevelOriginalOffset[pHalData->pwrGroupCnt][index] = Data; -} -void PHY_InitTxPowerByRate (struct adapter *padapter) {struct hal_com_data *pHalData =GET_HAL_DATA (padapter);
@@ -362,9 +352,6 @@ void PHY_StoreTxPowerByRate(if (pDM_Odm->PhyRegPgVersion >0 )PHY_StoreTxPowerByRateNew (padapter, RfPath, RegAddr, BitMask, Data); -else if (pDM_Odm->PhyRegPgVersion ==0 ) { -PHY_StoreTxPowerByRateOld (padapter, RegAddr, BitMask, Data); - } } static void
drivers/staging/rtl8723bs/include/hal_data.h +0 -4
@@ -198,10 +198,6 @@ struct hal_com_data {/* Store the original power by rate value of the base of each rate section of rf path A & B */ u8 TxPwrByRateBase2_4G[MAX_RF_PATH_NUM ][MAX_RATE_SECTION_NUM ]; -/* Read/write are allow for following hardware information variables */ -u8 pwrGroupCnt; -u32 MCSTxPowerLevelOriginalOffset[MAX_PG_GROUP ][16 ]; -u8 CrystalCap;u8 TypeGLNA;
Signature · 1 line
2.55.0
PATCH 3/9 staging: rtl8723bs: remove unused 'bIQKInitialized ' from hal_com_data
In reply to Nikolay KulikovThis field is always initialized to 'false' but is never used.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 --- drivers/staging/rtl8723bs/include/hal_data.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
@@ -1047,12 +1047,9 @@ void rtl8723b_init_default_value(struct adapter *padapter)/* init default value */ pHalData->fw_ractrl = false; - pHalData->bIQKInitialized = false;if (!adapter_to_pwrctl (padapter)->bkeepfwalive) pHalData->LastHMEBoxNum =0 ; - pHalData->bIQKInitialized = false; -/* init dm default value */ pdmpriv->TM_Trigger =0 ;/* for IQK */ /* pdmpriv->binitialized = false; */
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -206,7 +206,6 @@ struct hal_com_data {u8 TypeAPA;u8 RFEType;u8 BoardType; -u8 bIQKInitialized;bool bLCKInProgress;bool bSwChnl;
Signature · 1 line
2.55.0
PATCH 4/9 staging: rtl8723bs: remove unused 'bNeedIQK' from struct hal_com_data
In reply to Nikolay KulikovThe value 'true' is written to this field, but it is never used. Remove it and the case branch, as the latter becomes meaningless. This also requires removing calls to rtw_hal_set_hwreg() with the 'HW_VAR_DO_IQK' argument to prevent execution of the default branch containing the netdev_dbg() call in SetHwReg().
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/core/rtw_ap.c | 2 -- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 --- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 ---- drivers/staging/rtl8723bs/include/hal_data.h | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 5 files changed, 11 deletions(-)
drivers/staging/rtl8723bs/core/rtw_ap.c +0 -2
@@ -680,8 +680,6 @@ void start_bss_network(struct adapter *padapter)/* Beacon Control related register */ rtw_hal_set_hwreg (padapter,HW_VAR_BEACON_INTERVAL , (u8 *)(&bcn_interval)); -rtw_hal_set_hwreg (padapter,HW_VAR_DO_IQK ,NULL ); -if (!pmlmepriv->cur_network.join_res) {/* setting only at first time */ /* turn on all dynamic functions */ switch_dm_func (padapter,DYNAMIC_ALL_FUNC_ENABLE , true);
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -3
@@ -4009,8 +4009,6 @@ void start_create_ibss(struct adapter *padapter) val8 =0xcf ;rtw_hal_set_hwreg (padapter,HW_VAR_SEC_CFG , (u8 *)(&val8)); -rtw_hal_set_hwreg (padapter,HW_VAR_DO_IQK ,NULL ); -/* switch channel */ /* SelectChannel(padapter, pmlmeext->cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE); */ set_channel_bwmode (padapter, pmlmeext->cur_channel,HAL_PRIME_CHNL_OFFSET_DONT_CARE ,CHANNEL_WIDTH_20 );
@@ -5305,7 +5303,6 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf)rtw_hal_set_hwreg (padapter,HW_VAR_BSSID , pmlmeinfo->network.mac_address); join_type =0 ;rtw_hal_set_hwreg (padapter,HW_VAR_MLME_JOIN , (u8 *)(&join_type)); -rtw_hal_set_hwreg (padapter,HW_VAR_DO_IQK ,NULL );set_channel_bwmode (padapter, ch, offset, bw);
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -4
@@ -2636,10 +2636,6 @@ void SetHwReg8723B(struct adapter *padapter, u8 variable, u8 *val) }break ; -case HW_VAR_DO_IQK : - pHalData->bNeedIQK = true; -break ; -case HW_VAR_DL_RSVD_PAGE :if (check_fwstate (&padapter->mlmepriv,WIFI_AP_STATE ))rtl8723b_download_BTCoex_AP_mode_rsvd_page (padapter);
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -210,7 +210,6 @@ struct hal_com_data {bool bSwChnl;bool bSetChnlBW; -bool bNeedIQK;u8 TxPowerTrackControl;/* for mp mode, turn off txpwrtracking as default */
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -97,7 +97,6 @@ enum {HW_VAR_WIRELESS_MODE ,HW_VAR_USB_MODE ,HW_VAR_PORT_SWITCH , -HW_VAR_DO_IQK ,HW_VAR_DM_IN_LPS ,HW_VAR_SET_REQ_FW_PS , HW_VAR_FW_PS_STATE,
Signature · 1 line
2.55.0
PATCH 5/9 staging: rtl8723bs: hal: remove unused readings from the chip
In reply to Nikolay KulikovThese values are read from the chip but never used.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 --- drivers/staging/rtl8723bs/include/hal_data.h | 3 --- 2 files changed, 6 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
@@ -859,11 +859,8 @@ void rtl8723b_InitBeaconParameters(struct adapter *padapter)/* because test chip does not contension before sending beacon. by tynli. 2009.11.03 */ rtw_write16 (padapter,REG_BCNTCFG ,BCNTCFG_8723B ); - pHalData->RegBcnCtrlVal =rtw_read8 (padapter,REG_BCN_CTRL ); - pHalData->RegTxPause =rtw_read8 (padapter,REG_TXPAUSE ); pHalData->RegFwHwTxQCtrl =rtw_read8 (padapter,REG_FWHW_TXQ_CTRL +2 ); pHalData->RegReg542 =rtw_read8 (padapter,REG_TBTT_PROHIBIT +2 ); - pHalData->RegCR_1 =rtw_read8 (padapter,REG_CR +1 ); }void _InitBurstPktLen_8723BS (struct adapter *Adapter)
drivers/staging/rtl8723bs/include/hal_data.h +0 -3
@@ -223,12 +223,9 @@ struct hal_com_data {u8 LastHMEBoxNum;u8 fw_ractrl; -u8 RegTxPause;/* Beacon function related global variable. */ -u8 RegBcnCtrlVal;u8 RegFwHwTxQCtrl;u8 RegReg542; -u8 RegCR_1;u16 RegRRSR;u8 CurAntenna;
Signature · 1 line
2.55.0
PATCH 6/9 staging: rtl8723bs: remove unused 'UsbRxHighSpeedMode' from hal_com_data
In reply to Nikolay KulikovThe value 'false' is written to this field but is not used.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- drivers/staging/rtl8723bs/include/hal_data.h | 3 --- 2 files changed, 8 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -5
@@ -478,15 +478,10 @@ static void sdio_AggSettingRxUpdate(struct adapter *padapter)static void _initSdioAggregationSetting (struct adapter *padapter) { -struct hal_com_data *pHalData =GET_HAL_DATA (padapter); -/* Rx aggregation setting */ HalRxAggr8723BSdio (padapter);sdio_AggSettingRxUpdate (padapter); - -/* 201/12/10 MH Add for USB agg mode dynamic switch. */ - pHalData->UsbRxHighSpeedMode = false; }static void _InitOperationMode (struct adapter *padapter)
drivers/staging/rtl8723bs/include/hal_data.h +0 -3
@@ -244,9 +244,6 @@ struct hal_com_data {u8 OutEpQueueSel;u8 OutEpNumber; -/* 2010/12/10 MH Add for USB aggregation mode dynamic scheme. */ -bool UsbRxHighSpeedMode; -/* Auto FSM to Turn On, include clock, isolation, power control for MAC only */ u8 bMacPwrCtrlOn;
Signature · 1 line
2.55.0
PATCH 7/9 staging: rtl8723bs: remove unused spinlock 'SdioTxFIFOFreePageLock'
In reply to Nikolay KulikovRemove the 'SdioTxFIFOFreePageLock' spinlock from the struct hal_com_data, since the only operation performed on it is initialization, while the locking and unlocking calls are commented out.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/hal_sdio.c | 4 ---- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 1 - drivers/staging/rtl8723bs/include/hal_data.h | 1 - 3 files changed, 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_sdio.c +0 -4
@@ -39,8 +39,6 @@ void rtw_hal_sdio_update_tx_freepage(u8 RequiredPublicFreePgNum =0 ;/* _irqL irql; */ -/* spin_lock_bh(&pHalData->SdioTxFIFOFreePageLock); */ - DedicatedPgNum = pHalData->SdioTxFIFOFreePage[PageIdx];if (RequiredPageNum <= DedicatedPgNum) { pHalData->SdioTxFIFOFreePage[PageIdx] -= RequiredPageNum;
@@ -49,8 +47,6 @@ void rtw_hal_sdio_update_tx_freepage( RequiredPublicFreePgNum = RequiredPageNum - DedicatedPgNum; pHalData->SdioTxFIFOFreePage[PUBLIC_QUEUE_IDX ] -= RequiredPublicFreePgNum; } - -/* spin_unlock_bh(&pHalData->SdioTxFIFOFreePageLock); */ } void rtw_hal_set_sdio_tx_max_length(
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +0 -1
@@ -529,7 +529,6 @@ s32 rtl8723bs_init_xmit_priv(struct adapter *padapter) phal =GET_HAL_DATA (padapter); -spin_lock_init (&phal->SdioTxFIFOFreePageLock);init_completion (&xmitpriv->SdioXmitStart);init_completion (&xmitpriv->SdioXmitTerminate);
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -255,7 +255,6 @@ struct hal_com_data {/* SDIO Tx FIFO related. */ /* HIQ, MID, LOW, PUB free pages; padapter->xmitpriv.free_txpg */ u8 SdioTxFIFOFreePage[SDIO_TX_FREE_PG_QUEUE ]; -spinlock_t SdioTxFIFOFreePageLock;u8 SdioTxOQTMaxFreeSpace;u8 SdioTxOQTFreeSpace;
Signature · 1 line
2.55.0
PATCH 8/9 staging: rtl8723bs: remove 'rf_chip' from struct hal_com_data
In reply to Nikolay KulikovThe 'rf_chip' field is set to only one value (RF_6052), which makes any conditions with this field predictable.
Remove it and the associated static functions (_ReadRFType() and _InitRFType()), since they simply set a value in the field and will be empty without it.
Signed-off-by Nikolay Kulikov <[email protected]>
--- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 2 -- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 18 ------------------ drivers/staging/rtl8723bs/include/hal_data.h | 1 - 3 files changed, 21 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -2
@@ -649,8 +649,6 @@ static void phy_SwChnl8723B(struct adapter *padapter)struct hal_com_data *pHalData =GET_HAL_DATA (padapter);u8 channelToSW = pHalData->CurrentChannel; -if (pHalData->rf_chip ==RF_PSEUDO_11N ) -return ; pHalData->RfRegChnlVal[0 ] = ((pHalData->RfRegChnlVal[0 ] &0xfffff00 ) | channelToSW);PHY_SetRFReg (padapter,RF_PATH_A ,RF_CHNLBW ,0x3FF , pHalData->RfRegChnlVal[0 ]);PHY_SetRFReg (padapter,RF_PATH_B ,RF_CHNLBW ,0x3FF , pHalData->RfRegChnlVal[0 ]);
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -18
@@ -533,13 +533,6 @@ static void _InitInterrupt(struct adapter *padapter)InitInterrupt8723BSdio (padapter); } -static void _InitRFType (struct adapter *padapter) -{ -struct hal_com_data *pHalData =GET_HAL_DATA (padapter); - - pHalData->rf_chip =RF_6052 ; -} -static void _RfPowerSave (struct adapter *padapter) {/* YJ, TODO */
@@ -643,9 +636,6 @@ u32 rtl8723bs_hal_init(struct adapter *padapter)/* HW GPIO pin. Before PHY_RFConfig8192C. */ HalDetectPwrDownMode (padapter); -/* Set RF type for BB/RF configuration */ -_InitRFType (padapter); -/* Save target channel */ /* <Roger_Notes> Current Channel will be updated again later. */ pHalData->CurrentChannel =6 ;
@@ -976,13 +966,6 @@ static void _EfuseCellSel(struct adapter *padapter)rtw_write32 (padapter,EFUSE_TEST , value32); } -static void _ReadRFType (struct adapter *Adapter) -{ -struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); - - pHalData->rf_chip =RF_6052 ; -} -static void Hal_EfuseParseMACAddr_8723BS (struct adapter *padapter,u8 *hwinfo,bool AutoLoadFail )
@@ -1080,7 +1063,6 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)rtw_write8 (padapter,0x4e , val8);_EfuseCellSel (padapter); -_ReadRFType (padapter);_ReadPROMContent (padapter);if (!padapter->hw_init_completed) {
drivers/staging/rtl8723bs/include/hal_data.h +0 -1
@@ -157,7 +157,6 @@ struct hal_com_data {u32 ReceiveConfig;/* rf_ctrl */ -u8 rf_chip;u8 PackageType;/* EEPROM setting. */
Signature · 1 line
2.55.0
PATCH 9/9 staging: rtl8723bs: remove debug fields from hal_com_data
In reply to Nikolay KulikovThese fields are never set. They are never read from, since GetHalDefVar() function never receives the neccessary constants.
Signed-off-by Nikolay Kulikov <[email protected]>
--- drivers/staging/rtl8723bs/hal/hal_com.c | 6 ------ drivers/staging/rtl8723bs/include/hal_data.h | 3 --- 2 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +0 -6
@@ -643,12 +643,6 @@ u8 GetHalDefVar(case HAL_DEF_DBG_DM_FUNC : *((u32 *)value) = hal_data->odmpriv.SupportAbility;break ; -case HAL_DEF_DBG_DUMP_RXPKT : - *((u8 *)value) = hal_data->bDumpRxPkt; -break ; -case HAL_DEF_DBG_DUMP_TXPKT : - *((u8 *)value) = hal_data->bDumpTxPkt; -break ;case HAL_DEF_ANT_DETECT : *((u8 *)value) = hal_data->AntDetection;break ;
drivers/staging/rtl8723bs/include/hal_data.h +0 -3
@@ -234,9 +234,6 @@ struct hal_com_data {u8 u1ForcedIgiLb;/* forced IGI lower bound */ -u8 bDumpRxPkt;/* for debug */ -u8 bDumpTxPkt;/* for debug */ -/* 2010/08/09 MH Add CU power down mode. */ bool pwrdown;
Signature · 1 line
2.55.0