staging: rtl8723bs: remove empty functions
cover staging: rtl8723bs: remove empty functions
This series removes some empty functions from the driver code. The patches have been compile-tested only.
Michael Straube (7):
staging: rtl8723bs: CheckFwRsvdPageContent is empty
staging: rtl8723bs: rtl8723b_set_FwAoacRsvdPage_cmd is empty
staging: rtl8723bs: rtw_get_encrypt_decrypt_from_registrypriv is empty
staging: rtl8723bs: _InitOtherVariable is empty
staging: rtl8723bs: hw_var_port_switch is empty
staging: rtl8723bs: dm_CheckStatistics is empty
staging: rtl8723bs: DoIQK_8723B is empty
drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ------ drivers/staging/rtl8723bs/hal/HalPhyRf.h | 2 -- .../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 10 --------- .../staging/rtl8723bs/hal/HalPhyRf_8723B.h | 7 ------- drivers/staging/rtl8723bs/hal/hal_com.c | 7 ------- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 21 ++----------------- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 7 ------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- drivers/staging/rtl8723bs/include/hal_com.h | 2 -- .../staging/rtl8723bs/include/rtl8723b_cmd.h | 2 -- drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 -- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 - 13 files changed, 2 insertions(+), 72 deletions(-)
Signature · 1 line
2.50.1
PATCH 1/7 staging: rtl8723bs: CheckFwRsvdPageContent is empty
The function CheckFwRsvdPageContent is empty, remove it.
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 9 --------- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 2 -- 3 files changed, 13 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +0 -9
@@ -287,15 +287,6 @@ static void ConstructNullFunctionData( *pLength = pktlen; } -/* -* To check if reserved page content is destroyed by beacon because beacon -* is too large. -*/ -/* 2010.06.23. Added by tynli. */ -void CheckFwRsvdPageContent (struct adapter *Adapter) -{ -} -static void rtl8723b_set_FwRsvdPage_cmd (struct adapter *padapter,struct rsvdpage_loc *rsvdpageloc) {u8 u1H2CRsvdPageParm[H2C_RSVDPAGE_LOC_LEN ] = {0 };
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1196,8 +1196,6 @@ static void StopTxBeacon(struct adapter *padapter)rtw_write8 (padapter,REG_TBTT_PROHIBIT +1 ,0x64 ); pHalData->RegReg542 &= ~BIT (0 );rtw_write8 (padapter,REG_TBTT_PROHIBIT +2 , pHalData->RegReg542); - -CheckFwRsvdPageContent (padapter);/* 2010.06.23. Added by tynli. */ }static void _BeaconFunctionEnable (struct adapter *padapter,u8 Enable,u8 Linked)
drivers/staging/rtl8723bs/include/rtl8723b_cmd.h +0 -2
@@ -175,8 +175,6 @@ void rtl8723b_set_FwMediaStatusRpt_cmd(struct adapter *padapter, u8 mstatus, u8void rtl8723b_download_rsvd_page (struct adapter *padapter,u8 mstatus);void rtl8723b_download_BTCoex_AP_mode_rsvd_page (struct adapter *padapter); -void CheckFwRsvdPageContent (struct adapter *padapter); -void rtl8723b_set_FwPwrModeInIPS_cmd (struct adapter *padapter,u8 cmd_param);s32 FillH2CCmd8723B (struct adapter *padapter,u8 ElementID,u32 CmdLen,u8 *pCmdBuffer);
Signature · 1 line
2.50.1
PATCH 2/7 staging: rtl8723bs: rtl8723b_set_FwAoacRsvdPage_cmd is empty
In reply to Michael StraubeThe function rtl8723b_set_FwAoacRsvdPage_cmd is empty, remove it.
--- drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c +2 -10
@@ -300,10 +300,6 @@ static void rtl8723b_set_FwRsvdPage_cmd(struct adapter *padapter, struct rsvdpagFillH2CCmd8723B (padapter,H2C_8723B_RSVD_PAGE ,H2C_RSVDPAGE_LOC_LEN , u1H2CRsvdPageParm); } -static void rtl8723b_set_FwAoacRsvdPage_cmd (struct adapter *padapter,struct rsvdpage_loc *rsvdpageloc) -{ -} -void rtl8723b_set_FwMediaStatusRpt_cmd (struct adapter *padapter,u8 mstatus,u8 macid) {u8 u1H2CMediaStatusRptParm[H2C_MEDIA_STATUS_RPT_LEN ] = {0 };
@@ -605,12 +601,9 @@ static void rtl8723b_set_FwRsvdPagePkt(dump_mgntframe_and_wait (padapter, pcmdframe,100 ); } -if (check_fwstate (pmlmepriv, _FW_LINKED)) { +if (check_fwstate (pmlmepriv, _FW_LINKED))rtl8723b_set_FwRsvdPage_cmd (padapter, &RsvdPageLoc); -rtl8723b_set_FwAoacRsvdPage_cmd (padapter, &RsvdPageLoc); - }else { -rtl8723b_set_FwAoacRsvdPage_cmd (padapter, &RsvdPageLoc); - } +return ; error:
@@ -876,7 +869,6 @@ static void SetFwRsvdPagePkt_BTCoex(struct adapter *padapter)dump_mgntframe_and_wait (padapter, pcmdframe,100 );rtl8723b_set_FwRsvdPage_cmd (padapter, &RsvdPageLoc); -rtl8723b_set_FwAoacRsvdPage_cmd (padapter, &RsvdPageLoc);return ;
Signature · 1 line
2.50.1
PATCH 3/7 staging: rtl8723bs: rtw_get_encrypt_decrypt_from_registrypriv is empty
In reply to Michael StraubeThe function rtw_get_encrypt_decrypt_from_registrypriv is empty, remove it.
--- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ------ drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 -- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 - 3 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme.c +0 -6
@@ -1092,8 +1092,6 @@ void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf)struct wlan_network *pcur_wlan =NULL , *ptarget_wlan =NULL ;unsigned int the_same_macaddr = false; -rtw_get_encrypt_decrypt_from_registrypriv (adapter); - the_same_macaddr = !memcmp (pnetwork->network.mac_address, cur_network->network.mac_address,ETH_ALEN ); pnetwork->network.length =get_wlan_bssid_ex_sz (&pnetwork->network);
@@ -2095,10 +2093,6 @@ void rtw_update_registrypriv_dev_network(struct adapter *adapter)/* pdev_network->ie_length = cpu_to_le32(sz); */ } -void rtw_get_encrypt_decrypt_from_registrypriv (struct adapter *adapter) -{ -} -/* the function is at passive_level */ void rtw_joinbss_reset (struct adapter *padapter) {
drivers/staging/rtl8723bs/include/rtw_mlme.h +0 -2
@@ -341,8 +341,6 @@ extern void rtw_init_registrypriv_dev_network(struct adapter *adapter);extern void rtw_update_registrypriv_dev_network (struct adapter *adapter); -extern void rtw_get_encrypt_decrypt_from_registrypriv (struct adapter *adapter); -extern void _rtw_join_timeout_handler (struct timer_list *t);extern void rtw_scan_timeout_handler (struct timer_list *t);
drivers/staging/rtl8723bs/os_dep/os_intfs.c +0 -1
@@ -521,7 +521,6 @@ static void rtw_init_default_value(struct adapter *padapter) pmlmepriv->htpriv.ampdu_enable = false;/* set to disabled */ /* security_priv */ -/* rtw_get_encrypt_decrypt_from_registrypriv(padapter); */ psecuritypriv->binstallGrpkey = _FAIL; psecuritypriv->sw_encrypt = pregistrypriv->software_encrypt; psecuritypriv->sw_decrypt = pregistrypriv->software_decrypt;
Signature · 1 line
2.50.1
PATCH 4/7 staging: rtl8723bs: _InitOtherVariable is empty
In reply to Michael StraubeThe function _InitOtherVariable is empty, remove it.
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -5
@@ -1094,10 +1094,6 @@ static void _ReadPROMContent(struct adapter *padapter)_ReadEfuseInfo8723BS (padapter); } -static void _InitOtherVariable (struct adapter *Adapter) -{ -} -/* */ /* Description: */ /* Read HW adapter information by E-Fuse or EEPROM according CR9346 reported. */
@@ -1122,7 +1118,6 @@ static s32 _ReadAdapterInfo8723BS(struct adapter *padapter)_EfuseCellSel (padapter);_ReadRFType (padapter);_ReadPROMContent (padapter); -_InitOtherVariable (padapter);if (!padapter->hw_init_completed) {rtw_write8 (padapter,0x67 ,0x00 );/* for BT, Switch Ant control to BT */
Signature · 1 line
2.50.1
PATCH 5/7 staging: rtl8723bs: hw_var_port_switch is empty
In reply to Michael StraubeThe function hw_var_port_switch is empty, remove it.
--- drivers/staging/rtl8723bs/hal/hal_com.c | 7 ------- drivers/staging/rtl8723bs/include/hal_com.h | 2 -- 2 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +0 -7
@@ -569,19 +569,12 @@ void rtw_hal_update_sta_rate_mask(struct adapter *padapter, struct sta_info *pst psta->init_rate =get_highest_rate_idx (tx_ra_bitmap)&0x3f ; } -void hw_var_port_switch (struct adapter *adapter) -{ -} -void SetHwReg (struct adapter *adapter,u8 variable,u8 *val) {struct hal_com_data *hal_data =GET_HAL_DATA (adapter);struct dm_odm_t *odm = &(hal_data->odmpriv);switch (variable) { -case HW_VAR_PORT_SWITCH : -hw_var_port_switch (adapter); -break ;case HW_VAR_INIT_RTS_RATE :rtw_warn_on (1 );break ;
drivers/staging/rtl8723bs/include/hal_com.h +0 -2
@@ -134,8 +134,6 @@ s32 c2h_evt_read_88xx(struct adapter *adapter, u8 *buf);u8 rtw_get_mgntframe_raid (struct adapter *adapter,unsigned char network_type);void rtw_hal_update_sta_rate_mask (struct adapter *padapter,struct sta_info *psta); -void hw_var_port_switch (struct adapter *adapter); -void SetHwReg (struct adapter *padapter,u8 variable,u8 *val);void GetHwReg (struct adapter *padapter,u8 variable,u8 *val);void rtw_hal_check_rxfifo_full (struct adapter *adapter);
Signature · 1 line
2.50.1
PATCH 6/7 staging: rtl8723bs: dm_CheckStatistics is empty
In reply to Michael StraubeThe function dm_CheckStatistics is empty, remove it.
--- drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_dm.c +0 -7
@@ -12,9 +12,6 @@/* Global var */ -static void dm_CheckStatistics (struct adapter *Adapter) -{ -}/* */ /* functions */ /* */
@@ -144,10 +141,6 @@ void rtl8723b_HalDmWatchDog(struct adapter *Adapter) (hw_init_completed == true) && ((!fw_current_in_ps_mode) && bFwPSAwake) ) { -/* */ -/* Calculate Tx/Rx statistics. */ -/* */ -dm_CheckStatistics (Adapter);rtw_hal_check_rxfifo_full (Adapter); }
Signature · 1 line
2.50.1
PATCH 7/7 staging: rtl8723bs: DoIQK_8723B is empty
In reply to Michael StraubeThe function DoIQK_8723B is empty, remove the function and code that uses it.
--- drivers/staging/rtl8723bs/hal/HalPhyRf.h | 2 -- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 10 ---------- drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 7 ------- 3 files changed, 19 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf.h +0 -2
@@ -15,7 +15,6 @@ enum pwrtrack_method { };typedef void (*FuncSetPwr )(struct dm_odm_t *,enum pwrtrack_method ,u8 ,u8 ); -typedef void (*FuncIQK )(struct dm_odm_t *,u8 ,u8 ,u8 );typedef void (*FuncLCK )(struct dm_odm_t *);typedef void (*FuncSwing )(struct dm_odm_t *,u8 **,u8 **,u8 **,u8 **);
@@ -27,7 +26,6 @@ struct txpwrtrack_cfg {u8 RfPathCount;u32 ThermalRegAddr;FuncSetPwr ODM_TxPwrTrackSetPwr; -FuncIQK DoIQK;FuncLCK PHY_LCCalibrate;FuncSwing GetDeltaSwingTable; };
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +0 -10
@@ -142,15 +142,6 @@ static void setCCKFilterCoefficient(struct dm_odm_t *pDM_Odm, u8 CCKSwingIndex) } } -void DoIQK_8723B ( -struct dm_odm_t *pDM_Odm, -u8 DeltaThermalIndex, -u8 ThermalValue, -u8 Threshold -) -{ -} -/*----------------------------------------------------------------------------- * Function: odm_TxPwrTrackSetPwr88E() *
@@ -353,7 +344,6 @@ void ConfigureTxpowerTrack_8723B(struct txpwrtrack_cfg *pConfig) pConfig->ThermalRegAddr =RF_T_METER_8723B ; pConfig->ODM_TxPwrTrackSetPwr = ODM_TxPwrTrackSetPwr_8723B; - pConfig->DoIQK = DoIQK_8723B; pConfig->PHY_LCCalibrate = PHY_LCCalibrate_8723B; pConfig->GetDeltaSwingTable = GetDeltaSwingTable_8723B; }
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h +0 -7
@@ -18,13 +18,6 @@void ConfigureTxpowerTrack_8723B (struct txpwrtrack_cfg *pConfig); -void DoIQK_8723B ( -struct dm_odm_t *pDM_Odm, -u8 DeltaThermalIndex, -u8 ThermalValue, -u8 Threshold -); - void ODM_TxPwrTrackSetPwr_8723B( struct dm_odm_t *pDM_Odm, enum pwrtrack_method Method,
Signature · 1 line
2.50.1