staging: rtl8723bs: Remove unused functions including read_cam
cover staging: rtl8723bs: Remove unused functions including read_cam
Remove unused functions, macros and one enum.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (17):
staging: rtl8723bs: Remove unused function dvobj_get_port0_adapter
staging: rtl8723bs: Remove unused function rtw_search_max_mac_id
staging: rtl8723bs: Remove unused function read_cam
staging: rtl8723bs: Remove unused function rtw_get_oper_choffset
staging: rtl8723bs: Remove unused function rtw_get_oper_bw
staging: rtl8723bs: Remove unused function _ReadCAM
staging: rtl8723bs: Remove unused entries from struct hal_ops
staging: rtl8723bs: Remove unused function PHY_SetBWMode8723B
staging: rtl8723bs: Remove unused function PHY_GetTxPowerLevel8723B
staging: rtl8723bs: Remove unused function Hal_BT_EfusePowerSwitch
staging: rtl8723bs: Remove unused function rtl8723b_GetHalODMVar
staging: rtl8723bs: Remove unused function GetHalODMVar
staging: rtl8723bs: Remove unused function rtl8723bs_inirp_init
staging: rtl8723bs: Remove unused function rtl8723bs_inirp_deinit
staging: rtl8723bs: Remove constant result macro is_primary_adapter
staging: rtl8723bs: Remove constant result macro get_iface_type
staging: rtl8723bs: Remove unused enum with first entry IFACE_PORT0
drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 +- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 7 -- .../staging/rtl8723bs/core/rtw_wlan_util.c | 64 ------------------- drivers/staging/rtl8723bs/hal/hal_com.c | 34 +++------- drivers/staging/rtl8723bs/hal/hal_intf.c | 20 +++--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 53 --------------- .../staging/rtl8723bs/hal/rtl8723b_phycfg.c | 15 ----- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 13 ---- drivers/staging/rtl8723bs/include/drv_types.h | 10 --- drivers/staging/rtl8723bs/include/hal_com.h | 4 -- drivers/staging/rtl8723bs/include/hal_intf.h | 14 ---- .../staging/rtl8723bs/include/hal_phy_cfg.h | 5 -- .../staging/rtl8723bs/include/rtw_mlme_ext.h | 5 -- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +- 16 files changed, 22 insertions(+), 237 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/17 staging: rtl8723bs: Remove unused function dvobj_get_port0_adapter
Remove unused function dvobj_get_port0_adapter.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 8 -------- drivers/staging/rtl8723bs/include/drv_types.h | 2 -- 2 files changed, 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -8
@@ -1840,11 +1840,3 @@ u8 rtw_search_max_mac_id(struct adapter *padapter)return max_mac_id; } - -struct adapter *dvobj_get_port0_adapter (struct dvobj_priv *dvobj) -{ -if (get_iface_type (dvobj->padapters[i]) !=IFACE_PORT0 ) -return NULL ; - -return dvobj->padapters; -}
drivers/staging/rtl8723bs/include/drv_types.h +0 -2
@@ -320,8 +320,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)return &dvobj->intf_data.func->dev; } -struct adapter *dvobj_get_port0_adapter (struct dvobj_priv *dvobj); -enum {IFACE_PORT0 ,/* mapping to port0 for C/D series chips */ IFACE_PORT1 ,/* mapping to port1 for C/D series chip */
Signature · 1 line
2.43.0
PATCH 2/17 staging: rtl8723bs: Remove unused function rtw_search_max_mac_id
In reply to Philipp HortmannRemove unused function rtw_search_max_mac_id.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 18 ------------------ .../staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 19 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -18
@@ -1822,21 +1822,3 @@ void rtw_release_macid(struct adapter *padapter, struct sta_info *psta) }spin_unlock_bh (&pdvobj->lock); } - -/* For 8188E RA */ -u8 rtw_search_max_mac_id (struct adapter *padapter) -{ -u8 max_mac_id =0 ; -struct dvobj_priv *pdvobj =adapter_to_dvobj (padapter); -int i; - -spin_lock_bh (&pdvobj->lock); -for (i = (NUM_STA -1 ); i >=0 ; i--) { -if (pdvobj->macid[i] == true) -break ; - } - max_mac_id = i; -spin_unlock_bh (&pdvobj->lock); - -return max_mac_id; -}
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -1
@@ -528,7 +528,6 @@ void rtw_camid_free(struct adapter *adapter, u8 cam_id);extern void rtw_alloc_macid (struct adapter *padapter,struct sta_info *psta);extern void rtw_release_macid (struct adapter *padapter,struct sta_info *psta); -extern u8 rtw_search_max_mac_id (struct adapter *padapter);void report_join_res (struct adapter *padapter,int res);void report_survey_event (struct adapter *padapter,union recv_frame *precv_frame);
Signature · 1 line
2.43.0
PATCH 3/17 staging: rtl8723bs: Remove unused function read_cam
In reply to Philipp HortmannRemove unused function read_cam.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 13 ------------- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 2 -- 2 files changed, 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -13
@@ -460,19 +460,6 @@ static u32 _ReadCAM(struct adapter *padapter, u32 addr)return rtw_read32 (padapter,REG_CAMREAD ); } -void read_cam (struct adapter *padapter,u8 entry,u8 *get_key) -{ -u32 j, addr, cmd; - - addr = entry <<3 ; - -for (j =0 ; j <6 ; j++) { - cmd =_ReadCAM (padapter, addr+j); -if (j >1 )/* get key from cam */ -memcpy (get_key+(j-2 )*4 , &cmd,4 ); - } -} -void _write_cam (struct adapter *padapter,u8 entry,u16 ctrl,u8 *mac,u8 *key) {unsigned int i, val, addr;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -2
@@ -459,8 +459,6 @@ void r8723bs_select_channel(struct adapter *padapter, unsigned char channel);unsigned int decide_wait_for_beacon_timeout (unsigned int bcn_interval); -void read_cam (struct adapter *padapter,u8 entry,u8 *get_key); -/* modify HW only */ void _write_cam (struct adapter *padapter,u8 entry,u16 ctrl,u8 *mac,u8 *key);void _clear_cam_entry (struct adapter *padapter,u8 entry);
Signature · 1 line
2.43.0
PATCH 4/17 staging: rtl8723bs: Remove unused function rtw_get_oper_choffset
In reply to Philipp HortmannRemove unused function rtw_get_oper_choffset.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 ----- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -5
@@ -300,11 +300,6 @@ inline void rtw_set_oper_bw(struct adapter *adapter, u8 bw)adapter_to_dvobj (adapter)->oper_bwmode = bw; } -inline u8 rtw_get_oper_choffset (struct adapter *adapter) -{ -return adapter_to_dvobj (adapter)->oper_ch_offset; -} -inline void rtw_set_oper_choffset (struct adapter *adapter,u8 offset) {adapter_to_dvobj (adapter)->oper_ch_offset = offset;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -1
@@ -449,7 +449,6 @@ u8 rtw_get_oper_ch(struct adapter *adapter);void rtw_set_oper_ch (struct adapter *adapter,u8 ch);u8 rtw_get_oper_bw (struct adapter *adapter);void rtw_set_oper_bw (struct adapter *adapter,u8 bw); -u8 rtw_get_oper_choffset (struct adapter *adapter);void rtw_set_oper_choffset (struct adapter *adapter,u8 offset);u8 rtw_get_center_ch (u8 channel,u8 chnl_bw,u8 chnl_offset);unsigned long rtw_get_on_cur_ch_time (struct adapter *adapter);
Signature · 1 line
2.43.0
PATCH 5/17 staging: rtl8723bs: Remove unused function rtw_get_oper_bw
In reply to Philipp HortmannRemove unused function rtw_get_oper_bw.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 5 ----- drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 1 - 2 files changed, 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -5
@@ -290,11 +290,6 @@ inline void rtw_set_oper_ch(struct adapter *adapter, u8 ch) dvobj->oper_channel = ch; } -inline u8 rtw_get_oper_bw (struct adapter *adapter) -{ -return adapter_to_dvobj (adapter)->oper_bwmode; -} -inline void rtw_set_oper_bw (struct adapter *adapter,u8 bw) {adapter_to_dvobj (adapter)->oper_bwmode = bw;
drivers/staging/rtl8723bs/include/rtw_mlme_ext.h +0 -1
@@ -447,7 +447,6 @@ void Set_MSR(struct adapter *padapter, u8 type);u8 rtw_get_oper_ch (struct adapter *adapter);void rtw_set_oper_ch (struct adapter *adapter,u8 ch); -u8 rtw_get_oper_bw (struct adapter *adapter);void rtw_set_oper_bw (struct adapter *adapter,u8 bw);void rtw_set_oper_choffset (struct adapter *adapter,u8 offset);u8 rtw_get_center_ch (u8 channel,u8 chnl_bw,u8 chnl_offset);
Signature · 1 line
2.43.0
PATCH 6/17 staging: rtl8723bs: Remove unused function _ReadCAM
In reply to Philipp HortmannRemove unused function _ReadCAM.
--- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 15 --------------- 1 file changed, 15 deletions(-)
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +0 -15
@@ -435,21 +435,6 @@ void invalidate_cam_all(struct adapter *padapter)spin_unlock_bh (&cam_ctl->lock); } -static u32 _ReadCAM (struct adapter *padapter,u32 addr) -{ -u32 count =0 , cmd; - - cmd =CAM_POLLINIG | addr; -rtw_write32 (padapter,RWCAM , cmd); - -do { -if (0 == (rtw_read32 (padapter,REG_CAMCMD ) &CAM_POLLINIG )) -break ; - }while (count++ <100 ); - -return rtw_read32 (padapter,REG_CAMREAD ); -} -void _write_cam (struct adapter *padapter,u8 entry,u16 ctrl,u8 *mac,u8 *key) {unsigned int i, val, addr;
Signature · 1 line
2.43.0
PATCH 7/17 staging: rtl8723bs: Remove unused entries from struct hal_ops
In reply to Philipp HortmannRemove unused function pointers from struct hal_ops.
--- drivers/staging/rtl8723bs/include/hal_intf.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8723bs/include/hal_intf.h +0 -7
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -u32 (*hal_power_on)(struct adapter *padapter); -void (*hal_power_off)(struct adapter *padapter);u32 (*hal_init)(struct adapter *padapter);u32 (*hal_deinit)(struct adapter *padapter);
@@ -171,7 +169,6 @@ struct hal_ops {u32 (*inirp_init)(struct adapter *padapter);u32 (*inirp_deinit)(struct adapter *padapter); -void (*irp_reset)(struct adapter *padapter);s32 (*init_xmit_priv)(struct adapter *padapter);void (*free_xmit_priv)(struct adapter *padapter);
@@ -192,8 +189,6 @@ struct hal_ops {void (*enable_interrupt)(struct adapter *padapter);void (*disable_interrupt)(struct adapter *padapter);u8 (*check_ips_status)(struct adapter *padapter); -s32 (*interrupt_handler)(struct adapter *padapter); -void (*clear_interrupt)(struct adapter *padapter);void (*set_bwmode_handler)(struct adapter *padapter,enum channel_width Bandwidth,u8 Offset);void (*set_channel_handler)(struct adapter *padapter,u8 channel);void (*set_chnl_bw_handler)(struct adapter *padapter,u8 channel,enum channel_width Bandwidth,u8 Offset40,u8 Offset80);
@@ -224,8 +219,6 @@ struct hal_ops {void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter); -u8 (*interface_ps_func)(struct adapter *padapter,enum hal_intf_ps_func efunc_id,u8 *val); -s32 (*hal_xmit)(struct adapter *padapter,struct xmit_frame *pxmitframe);/* * mgnt_xmit should be implemented to run in interrupt context
Signature · 1 line
2.43.0
PATCH 8/17 staging: rtl8723bs: Remove unused function PHY_SetBWMode8723B
In reply to Philipp HortmannRemove unused function PHY_SetBWMode8723B and belonging unused function pointer in struct hal_ops set_bwmode_handler.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 11 ----------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 3 --- 4 files changed, 16 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1884,7 +1884,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B; - pHalFunc->set_bwmode_handler = &PHY_SetBWMode8723B; pHalFunc->set_channel_handler = &PHY_SwChnl8723B; pHalFunc->set_chnl_bw_handler = &PHY_SetSwChnlBWMode8723B;
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -11
@@ -764,17 +764,6 @@ static void PHY_HandleSwChnlAndSetBW8723B( } } -void PHY_SetBWMode8723B ( -struct adapter *Adapter, -enum channel_width Bandwidth,/* 20M or 40M */ -unsigned char Offset/* Upper, Lower, or Don't care */ -) -{ -struct hal_com_data *pHalData =GET_HAL_DATA (Adapter); - -PHY_HandleSwChnlAndSetBW8723B (Adapter, false, true, pHalData->CurrentChannel, Bandwidth, Offset, Offset, pHalData->CurrentChannel); -} -/* Call after initialization */ void PHY_SwChnl8723B (struct adapter *Adapter,u8 channel) {
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -189,7 +189,6 @@ struct hal_ops {void (*enable_interrupt)(struct adapter *padapter);void (*disable_interrupt)(struct adapter *padapter);u8 (*check_ips_status)(struct adapter *padapter); -void (*set_bwmode_handler)(struct adapter *padapter,enum channel_width Bandwidth,u8 Offset);void (*set_channel_handler)(struct adapter *padapter,u8 channel);void (*set_chnl_bw_handler)(struct adapter *padapter,u8 channel,enum channel_width Bandwidth,u8 Offset40,u8 Offset80);
drivers/staging/rtl8723bs/include/hal_phy_cfg.h +0 -3
@@ -53,9 +53,6 @@ void PHY_GetTxPowerLevel8723B(struct adapter *Adapter, s32 *powerlevel);void PHY_SetTxPowerLevel8723B (struct adapter *Adapter,u8 channel); -void PHY_SetBWMode8723B (struct adapter *Adapter,enum channel_width Bandwidth, -unsigned char Offset); -/* Call after initialization */ void PHY_SwChnl8723B (struct adapter *Adapter,u8 channel);
Signature · 1 line
2.43.0
PATCH 9/17 staging: rtl8723bs: Remove unused function PHY_GetTxPowerLevel8723B
In reply to Philipp HortmannRemove unused function PHY_GetTxPowerLevel8723B and belonging unused function pointer in struct hal_ops get_tx_power_level_handler.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 4 ---- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 2 -- 4 files changed, 8 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1888,7 +1888,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->set_chnl_bw_handler = &PHY_SetSwChnlBWMode8723B; pHalFunc->set_tx_power_level_handler = &PHY_SetTxPowerLevel8723B; - pHalFunc->get_tx_power_level_handler = &PHY_GetTxPowerLevel8723B; pHalFunc->hal_dm_watchdog = &rtl8723b_HalDmWatchDog; pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS;
drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c +0 -4
@@ -575,10 +575,6 @@ void PHY_SetTxPowerLevel8723B(struct adapter *Adapter, u8 Channel)PHY_SetTxPowerLevelByPath (Adapter, Channel, RFPath); } -void PHY_GetTxPowerLevel8723B (struct adapter *Adapter,s32 *powerlevel) -{ -} -static void phy_SetRegBW_8723B (struct adapter *Adapter,enum channel_width CurrentBW )
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -193,7 +193,6 @@ struct hal_ops {void (*set_chnl_bw_handler)(struct adapter *padapter,u8 channel,enum channel_width Bandwidth,u8 Offset40,u8 Offset80);void (*set_tx_power_level_handler)(struct adapter *padapter,u8 channel); -void (*get_tx_power_level_handler)(struct adapter *padapter,s32 *powerlevel);void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter);
drivers/staging/rtl8723bs/include/hal_phy_cfg.h +0 -2
@@ -49,8 +49,6 @@ void PHY_SetTxPowerIndex(struct adapter *Adapter, u32 PowerIndex,u8 PHY_GetTxPowerIndex (struct adapter *padapter,u8 RFPath,u8 Rate,enum channel_width BandWidth,u8 Channel); -void PHY_GetTxPowerLevel8723B (struct adapter *Adapter,s32 *powerlevel); -void PHY_SetTxPowerLevel8723B (struct adapter *Adapter,u8 channel);/* Call after initialization */
Signature · 1 line
2.43.0
PATCH 10/17 staging: rtl8723bs: Remove unused function Hal_BT_EfusePowerSwitch
In reply to Philipp HortmannRemove unused function Hal_BT_EfusePowerSwitch and belonging unused function pointer in struct hal_ops BTEfusePowerSwitch.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 ------------------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 41 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -40
@@ -604,45 +604,6 @@ static void Hal_GetEfuseDefinition(#define EFUSE_ACCESS_ON_8723 0x69/* For RTL8723 only. */ #define REG_EFUSE_ACCESS_8723 0x00CF/* Efuse access protection for RTL8723 */ -/* */ -static void Hal_BT_EfusePowerSwitch ( -struct adapter *padapter,u8 bWrite,u8 PwrState -) -{ -u8 tempval; -if (PwrState) { -/* enable BT power cut */ -/* 0x6A[14] = 1 */ - tempval =rtw_read8 (padapter,0x6B ); - tempval |=BIT (6 ); -rtw_write8 (padapter,0x6B , tempval); - -/* Attention!! Between 0x6A[14] and 0x6A[15] setting need 100us delay */ -/* So don't write 0x6A[14]= 1 and 0x6A[15]= 0 together! */ -msleep (1 ); -/* disable BT output isolation */ -/* 0x6A[15] = 0 */ - tempval =rtw_read8 (padapter,0x6B ); - tempval &= ~BIT (7 ); -rtw_write8 (padapter,0x6B , tempval); - }else { -/* enable BT output isolation */ -/* 0x6A[15] = 1 */ - tempval =rtw_read8 (padapter,0x6B ); - tempval |=BIT (7 ); -rtw_write8 (padapter,0x6B , tempval); - -/* Attention!! Between 0x6A[14] and 0x6A[15] setting need 100us delay */ -/* So don't write 0x6A[14]= 1 and 0x6A[15]= 0 together! */ - -/* disable BT power cut */ -/* 0x6A[14] = 1 */ - tempval =rtw_read8 (padapter,0x6B ); - tempval &= ~BIT (6 ); -rtw_write8 (padapter,0x6B , tempval); - } - -}static void Hal_EfusePowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState )
@@ -1906,7 +1867,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->write_rfreg = &PHY_SetRFReg_8723B;/* Efuse related function */ - pHalFunc->BTEfusePowerSwitch = &Hal_BT_EfusePowerSwitch; pHalFunc->EfusePowerSwitch = &Hal_EfusePowerSwitch; pHalFunc->ReadEFuse = &Hal_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -230,7 +230,6 @@ struct hal_ops {void (*write_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask,u32 Data);void (*EfusePowerSwitch)(struct adapter *padapter,u8 bWrite,u8 PwrState); -void (*BTEfusePowerSwitch)(struct adapter *padapter,u8 bWrite,u8 PwrState);void (*ReadEFuse)(struct adapter *padapter,u8 efuseType,u16 _offset,u16 _size_byte,u8 *pbuf,bool bPseudoTest);void (*EFUSEGetEfuseDefinition)(struct adapter *padapter,u8 efuseType,u8 type,void *pOut,bool bPseudoTest);u16 (*EfuseGetCurrentSize)(struct adapter *padapter,u8 efuseType,bool bPseudoTest);
Signature · 1 line
2.43.0
PATCH 11/17 staging: rtl8723bs: Remove unused function rtl8723b_GetHalODMVar
In reply to Philipp HortmannRemove unused function rtl8723b_GetHalODMVar and belonging unused function pointer in struct hal_ops GetHalODMVarHandler.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 11 ----------- drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 12 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -11
@@ -1769,16 +1769,6 @@ static void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter)rtw_write8 (padapter, bcn_ctrl_reg, val8); } -static void rtl8723b_GetHalODMVar ( -struct adapter *Adapter, -enum hal_odm_variable eVariable, -void *pValue1, -void *pValue2 -) -{ -GetHalODMVar (Adapter, eVariable, pValue1, pValue2); -} - static void rtl8723b_SetHalODMVar( struct adapter *Adapter, enum hal_odm_variable eVariable,
@@ -1876,7 +1866,6 @@ void rtl8723b_set_hal_ops(struct hal_ops *pHalFunc) pHalFunc->Efuse_WordEnableDataWrite = &Hal_EfuseWordEnableDataWrite; pHalFunc->Efuse_PgPacketWrite_BT = &Hal_EfusePgPacketWrite_BT; - pHalFunc->GetHalODMVarHandler = &rtl8723b_GetHalODMVar; pHalFunc->SetHalODMVarHandler = &rtl8723b_SetHalODMVar; pHalFunc->xmit_thread_handler = &hal_xmit_handler;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -206,7 +206,6 @@ struct hal_ops {u8 (*GetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue);u8 (*SetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue); -void (*GetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,void *pValue2);void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);void (*UpdateRAMaskHandler)(struct adapter *padapter,u32 mac_id,u8 rssi_level);
Signature · 1 line
2.43.0
PATCH 12/17 staging: rtl8723bs: Remove unused function GetHalODMVar
In reply to Philipp HortmannRemove unused function GetHalODMVar.
--- drivers/staging/rtl8723bs/hal/hal_com.c | 13 ------------- drivers/staging/rtl8723bs/include/hal_com.h | 4 ---- 2 files changed, 17 deletions(-)
drivers/staging/rtl8723bs/hal/hal_com.c +0 -13
@@ -796,19 +796,6 @@ u8 GetHalDefVar(return bResult; } -void GetHalODMVar ( -struct adapter *Adapter, -enum hal_odm_variable eVariable, -void *pValue1, -void *pValue2 -) -{ -switch (eVariable) { -default : -break ; - } -} - void SetHalODMVar( struct adapter *Adapter, enum hal_odm_variable eVariable,
drivers/staging/rtl8723bs/include/hal_com.h +0 -4
@@ -158,10 +158,6 @@ void rtw_dump_raw_rssi_info(struct adapter *padapter);void rtw_bb_rf_gain_offset (struct adapter *padapter); -void GetHalODMVar (struct adapter *Adapter, -enum hal_odm_variable eVariable, -void *pValue1, -void *pValue2); void SetHalODMVar( struct adapter *Adapter, enum hal_odm_variable eVariable,
Signature · 1 line
2.43.0
PATCH 13/17 staging: rtl8723bs: Remove unused function rtl8723bs_inirp_init
In reply to Philipp HortmannRemove unused function rtl8723bs_inirp_init and belonging unused function pointer in struct hal_ops inirp_init.
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 6 ------ drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 2 files changed, 7 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -6
@@ -937,11 +937,6 @@ static u32 rtl8723bs_hal_deinit(struct adapter *padapter)return _SUCCESS; } -static u32 rtl8723bs_inirp_init (struct adapter *padapter) -{ -return _SUCCESS; -} -static u32 rtl8723bs_inirp_deinit (struct adapter *padapter) {return _SUCCESS;
@@ -1272,7 +1267,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) pHalFunc->hal_init = &rtl8723bs_hal_init; pHalFunc->hal_deinit = &rtl8723bs_hal_deinit; - pHalFunc->inirp_init = &rtl8723bs_inirp_init; pHalFunc->inirp_deinit = &rtl8723bs_inirp_deinit; pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -167,7 +167,6 @@ struct hal_ops {void (*free_hal_data)(struct adapter *padapter); -u32 (*inirp_init)(struct adapter *padapter);u32 (*inirp_deinit)(struct adapter *padapter);s32 (*init_xmit_priv)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 14/17 staging: rtl8723bs: Remove unused function rtl8723bs_inirp_deinit
In reply to Philipp HortmannRemove unused function rtl8723bs_inirp_deinit and belonging unused function pointer in struct hal_ops inirp_deinit.
--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 7 ------- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 2 files changed, 9 deletions(-)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -7
@@ -937,11 +937,6 @@ static u32 rtl8723bs_hal_deinit(struct adapter *padapter)return _SUCCESS; } -static u32 rtl8723bs_inirp_deinit (struct adapter *padapter) -{ -return _SUCCESS; -} -static void rtl8723bs_init_default_value (struct adapter *padapter) {struct hal_com_data *pHalData;
@@ -1267,8 +1262,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter) pHalFunc->hal_init = &rtl8723bs_hal_init; pHalFunc->hal_deinit = &rtl8723bs_hal_deinit; - pHalFunc->inirp_deinit = &rtl8723bs_inirp_deinit; - pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv; pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -167,8 +167,6 @@ struct hal_ops {void (*free_hal_data)(struct adapter *padapter); -u32 (*inirp_deinit)(struct adapter *padapter); -s32 (*init_xmit_priv)(struct adapter *padapter);void (*free_xmit_priv)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 15/17 staging: rtl8723bs: Remove constant result macro is_primary_adapter
In reply to Philipp HortmannRemove macro is_primary_adapter that returns always true to shorten code.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 3 +-- drivers/staging/rtl8723bs/core/rtw_mlme.c | 6 ++---- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 3 --- drivers/staging/rtl8723bs/hal/hal_com.c | 21 ++++++++----------- drivers/staging/rtl8723bs/hal/hal_intf.c | 20 +++++++----------- drivers/staging/rtl8723bs/include/drv_types.h | 1 - drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +-- 7 files changed, 21 insertions(+), 36 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -2
@@ -1258,8 +1258,7 @@ static void dynamic_chk_wk_hdl(struct adapter *padapter)/* always call rtw_ps_processor() at last one. */ -if (is_primary_adapter (padapter)) -rtw_ps_processor (padapter); +rtw_ps_processor (padapter); }void lps_ctrl_wk_hdl (struct adapter *padapter,u8 lps_ctrl_type);
drivers/staging/rtl8723bs/core/rtw_mlme.c +2 -4
@@ -911,8 +911,7 @@ inline void rtw_indicate_scan_done(struct adapter *padapter, bool aborted) {rtw_os_indicate_scan_done (padapter, aborted); -if (is_primary_adapter (padapter) && - (!adapter_to_pwrctl (padapter)->bInSuspend) && +if ((!adapter_to_pwrctl (padapter)->bInSuspend) && (!check_fwstate (&padapter->mlmepriv,WIFI_ASOC_STATE |WIFI_UNDER_LINKING ))) {rtw_set_ips_deny (padapter,0 );
@@ -1589,8 +1588,7 @@ void rtw_dynamic_check_timer_handler(struct adapter *adapter) } }else { -if (is_primary_adapter (adapter)) -rtw_dynamic_chk_wk_cmd (adapter); +rtw_dynamic_chk_wk_cmd (adapter); }/* auto site survey */
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +0 -3
@@ -73,9 +73,6 @@ int ips_leave(struct adapter *padapter)struct pwrctrl_priv *pwrpriv =adapter_to_pwrctl (padapter);int ret; -if (!is_primary_adapter (padapter)) -return _SUCCESS; -mutex_lock (&pwrpriv->lock); ret =_ips_leave (padapter);mutex_unlock (&pwrpriv->lock);
drivers/staging/rtl8723bs/hal/hal_com.c +9 -12
@@ -13,23 +13,20 @@u8 rtw_hal_data_init (struct adapter *padapter) { -if (is_primary_adapter (padapter)) {/* if (padapter->isprimary) */ - padapter->hal_data_sz =sizeof (struct hal_com_data ); - padapter->HalData =vzalloc (padapter->hal_data_sz); -if (!padapter->HalData) -return _FAIL; - } + padapter->hal_data_sz =sizeof (struct hal_com_data ); + padapter->HalData =vzalloc (padapter->hal_data_sz); +if (!padapter->HalData) +return _FAIL; +return _SUCCESS; }void rtw_hal_data_deinit (struct adapter *padapter) { -if (is_primary_adapter (padapter)) {/* if (padapter->isprimary) */ -if (padapter->HalData) { -vfree (padapter->HalData); - padapter->HalData =NULL ; - padapter->hal_data_sz =0 ; - } +if (padapter->HalData) { +vfree (padapter->HalData); + padapter->HalData =NULL ; + padapter->hal_data_sz =0 ; } }
drivers/staging/rtl8723bs/hal/hal_intf.c +8 -12
@@ -27,9 +27,8 @@ void rtw_hal_read_chip_version(struct adapter *padapter)void rtw_hal_def_value_init (struct adapter *padapter) { -if (is_primary_adapter (padapter)) -if (padapter->HalFunc.init_default_value) - padapter->HalFunc.init_default_value (padapter); +if (padapter->HalFunc.init_default_value) + padapter->HalFunc.init_default_value (padapter); }void rtw_hal_free_data (struct adapter *padapter)
@@ -37,24 +36,21 @@ void rtw_hal_free_data(struct adapter *padapter)/* free HAL Data */ rtw_hal_data_deinit (padapter); -if (is_primary_adapter (padapter)) -if (padapter->HalFunc.free_hal_data) - padapter->HalFunc.free_hal_data (padapter); +if (padapter->HalFunc.free_hal_data) + padapter->HalFunc.free_hal_data (padapter); }void rtw_hal_dm_init (struct adapter *padapter) { -if (is_primary_adapter (padapter)) -if (padapter->HalFunc.dm_init) - padapter->HalFunc.dm_init (padapter); +if (padapter->HalFunc.dm_init) + padapter->HalFunc.dm_init (padapter); }void rtw_hal_dm_deinit (struct adapter *padapter) {/* cancel dm timer */ -if (is_primary_adapter (padapter)) -if (padapter->HalFunc.dm_deinit) - padapter->HalFunc.dm_deinit (padapter); +if (padapter->HalFunc.dm_deinit) + padapter->HalFunc.dm_deinit (padapter); }static void rtw_hal_init_opmode (struct adapter *padapter)
drivers/staging/rtl8723bs/include/drv_types.h +0 -1
@@ -182,7 +182,6 @@ struct registry_priv {#include <drv_types_sdio.h> -#define is_primary_adapter (adapter) (1)#define get_iface_type (adapter) (IFACE_PORT0)#define GET_PRIMARY_ADAPTER (padapter) (((struct adapter *)padapter)->dvobj->if1)#define GET_IFACE_NUMS (padapter) (((struct adapter *)padapter)->dvobj->iface_nums)
drivers/staging/rtl8723bs/os_dep/os_intfs.c +1 -2
@@ -633,8 +633,7 @@ void rtw_reset_drv_sw(struct adapter *padapter)struct pwrctrl_priv *pwrctrlpriv =adapter_to_pwrctl (padapter);/* hal_priv */ -if (is_primary_adapter (padapter)) -rtw_hal_def_value_init (padapter); +rtw_hal_def_value_init (padapter);RTW_ENABLE_FUNC (padapter,DF_RX_BIT );RTW_ENABLE_FUNC (padapter,DF_TX_BIT );
Signature · 1 line
2.43.0
PATCH 16/17 staging: rtl8723bs: Remove constant result macro get_iface_type
In reply to Philipp HortmannRemove macro get_iface_type that returns always false to shorten code.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 3 +-- drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 ---- drivers/staging/rtl8723bs/include/drv_types.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -2
@@ -4872,8 +4872,7 @@ void mlmeext_joinbss_event_callback(struct adapter *padapter, int join_res)/* set_link_timer(pmlmeext, DISCONNECT_TO); */ } -if (get_iface_type (padapter) ==IFACE_PORT0 ) -rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_CONNECT ,0 ); +rtw_lps_ctrl_wk_cmd (padapter,LPS_CTRL_CONNECT ,0 ); }/* currently only adhoc mode will go here */
drivers/staging/rtl8723bs/core/rtw_pwrctrl.c +0 -4
@@ -452,10 +452,6 @@ void LPS_Enter(struct adapter *padapter, const char *msg)if (n_assoc_iface !=1 )return ; -/* Skip lps enter request for adapter not port0 */ -if (get_iface_type (padapter) !=IFACE_PORT0 ) -return ; -if (!PS_RDY_CHECK (dvobj->padapters))return ;
drivers/staging/rtl8723bs/include/drv_types.h +0 -1
@@ -182,7 +182,6 @@ struct registry_priv {#include <drv_types_sdio.h> -#define get_iface_type (adapter) (IFACE_PORT0)#define GET_PRIMARY_ADAPTER (padapter) (((struct adapter *)padapter)->dvobj->if1)#define GET_IFACE_NUMS (padapter) (((struct adapter *)padapter)->dvobj->iface_nums)#define GET_ADAPTER (padapter, iface_id) (((struct adapter *)padapter)->dvobj->padapters[iface_id])
Signature · 1 line
2.43.0
PATCH 17/17 staging: rtl8723bs: Remove unused enum with first entry IFACE_PORT0
In reply to Philipp HortmannRemove unused enum with first entry IFACE_PORT0.
--- drivers/staging/rtl8723bs/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8723bs/include/drv_types.h +0 -6
@@ -318,12 +318,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)return &dvobj->intf_data.func->dev; } -enum { -IFACE_PORT0 ,/* mapping to port0 for C/D series chips */ -IFACE_PORT1 ,/* mapping to port1 for C/D series chip */ -MAX_IFACE_PORT , -}; -enum {DRIVER_NORMAL =0 ,DRIVER_DISAPPEAR =1 ,
Signature · 1 line
2.43.0
Quoted 14 lines · Philipp Hortmann
Remove unused functions, macros and one enum.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (17):
staging: rtl8723bs: Remove unused functiondvobj_get_port0_adapter
staging: rtl8723bs: Remove unused functionrtw_search_max_mac_id
staging: rtl8723bs: Remove unused functionread_cam
staging: rtl8723bs: Remove unused functionrtw_get_oper_choffset
staging: rtl8723bs: Remove unused functionrtw_get_oper_bw
staging: rtl8723bs: Remove unused function_ReadCAM
staging: rtl8723bs: Remove unused entries from structhal_ops
staging: rtl8723bs: Remove unused functionPHY_SetBWMode8723B
staging: rtl8723bs: Remove unused functionPHY_GetTxPowerLevel8723B
Quoted 8 lines
staging: rtl8723bs: Remove unused function
Hal_BT_EfusePowerSwitch
staging: rtl8723bs: Remove unused functionrtl8723b_GetHalODMVar
staging: rtl8723bs: Remove unused function GetHalODMVar
staging: rtl8723bs: Remove unused functionrtl8723bs_inirp_init
staging: rtl8723bs: Remove unused functionrtl8723bs_inirp_deinit
staging: rtl8723bs: Remove constant result macrois_primary_adapter
staging: rtl8723bs: Remove constant result macroget_iface_type
staging: rtl8723bs: Remove unused enum with first entryIFACE_PORT0
Thanks Philipp!
regards,
dan carpenter