staging: rtl8723bs: Replace function pointers starting with UpdateRAMaskHandler
cover staging: rtl8723bs: Replace function pointers starting with UpdateRAMaskHandler
Replace function pointers with functions to increase readability.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (16):
staging: rtl8723bs: Remove function pointer UpdateRAMaskHandler
staging: rtl8723bs: Remove function pointer set_channel_handler
staging: rtl8723bs: Remove function pointer set_chnl_bw_handler
staging: rtl8723bs: Remove function pointer set_tx_power_level_handler
staging: rtl8723bs: Remove function pointer hal_dm_watchdog
staging: rtl8723bs: Remove function pointer hal_dm_watchdog_in_lps
staging: rtl8723bs: Remove function pointer
SetBeaconRelatedRegistersHandler
staging: rtl8723bs: Remove function pointer Add_RateATid
staging: rtl8723bs: Remove function pointer run_thread
staging: rtl8723bs: Remove function pointer cancel_thread
staging: rtl8723bs: Remove function pointer read_bbreg
staging: rtl8723bs: Remove function pointer write_bbreg
staging: rtl8723bs: Remove function pointer read_rfreg
staging: rtl8723bs: Remove function pointer write_rfreg
staging: rtl8723bs: Remove function pointer EfusePowerSwitch
staging: rtl8723bs: Remove function pointer ReadEFuse
drivers/staging/rtl8723bs/core/rtw_efuse.c | 4 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 47 +++++-------------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 33 ++----------- drivers/staging/rtl8723bs/include/hal_intf.h | 28 ++--------- drivers/staging/rtl8723bs/include/rtw_mp.h | 4 -- 5 files changed, 24 insertions(+), 92 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/16 staging: rtl8723bs: Remove function pointer UpdateRAMaskHandler
Remove function pointer UpdateRAMaskHandler and use UpdateHalRAMask8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -221,8 +221,7 @@ 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 { -if (padapter->HalFunc.UpdateRAMaskHandler) - padapter->HalFunc.UpdateRAMaskHandler (padapter, psta->mac_id, rssi_level); +UpdateHalRAMask8723B (padapter, psta->mac_id, rssi_level); } }
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1704,7 +1704,7 @@ static void hal_notch_filter_8723b(struct adapter *adapter, bool enable)rtw_write8 (adapter, rOFDM0_RxDSP+1 ,rtw_read8 (adapter, rOFDM0_RxDSP+1 ) & ~BIT1 ); } -static void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level) +void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level) {u32 mask, rate_bitmap;u8 shortGIrate = false;
@@ -1744,8 +1744,6 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_lvoid rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8723B; - pHalFunc->set_channel_handler = &PHY_SwChnl8723B; pHalFunc->set_chnl_bw_handler = &PHY_SetSwChnlBWMode8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -1
@@ -172,7 +172,6 @@ struct hal_ops {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);void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);void (*Add_RateATid)(struct adapter *padapter,u32 bitmap,u8 *arg,u8 rssi_level);
@@ -308,4 +307,5 @@ void GetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val);void SetHwRegWithBuf8723B (struct adapter *padapter,u8 variable,u8 *pbuf,int len);u8 GetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue);u8 SetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue); +void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 2/16 staging: rtl8723bs: Remove function pointer set_channel_handler
In reply to Philipp HortmannRemove function pointer set_channel_handler and use PHY_SwChnl8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -274,8 +274,7 @@ void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32void rtw_hal_set_chan (struct adapter *padapter,u8 channel) { -if (padapter->HalFunc.set_channel_handler) - padapter->HalFunc.set_channel_handler (padapter, channel); +PHY_SwChnl8723B (padapter, channel); } void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel,
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->set_channel_handler = &PHY_SwChnl8723B; pHalFunc->set_chnl_bw_handler = &PHY_SetSwChnlBWMode8723B; pHalFunc->set_tx_power_level_handler = &PHY_SetTxPowerLevel8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -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);void (*set_tx_power_level_handler)(struct adapter *padapter,u8 channel);
Signature · 1 line
2.43.0
PATCH 3/16 staging: rtl8723bs: Remove function pointer set_chnl_bw_handler
In reply to Philipp HortmannRemove function pointer set_chnl_bw_handler and use PHY_SetSwChnlBWMode8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -4
@@ -280,10 +280,7 @@ void rtw_hal_set_chan(struct adapter *padapter, u8 channel)void rtw_hal_set_chnl_bw (struct adapter *padapter,u8 channel,enum channel_width Bandwidth,u8 Offset40,u8 Offset80) { -if (padapter->HalFunc.set_chnl_bw_handler) - padapter->HalFunc.set_chnl_bw_handler (padapter, channel, - Bandwidth, Offset40, - Offset80); +PHY_SetSwChnlBWMode8723B (padapter, channel, Bandwidth, Offset40, Offset80); }void rtw_hal_dm_watchdog (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)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->hal_dm_watchdog = &rtl8723b_HalDmWatchDog;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);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 (*hal_dm_watchdog)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 4/16 staging: rtl8723bs: Remove function pointer set_tx_power_level_handler
In reply to Philipp HortmannRemove function pointer set_tx_power_level_handler as it is not in use.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 2 files changed, 4 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->set_tx_power_level_handler = &PHY_SetTxPowerLevel8723B; - pHalFunc->hal_dm_watchdog = &rtl8723b_HalDmWatchDog; pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*set_tx_power_level_handler)(struct adapter *padapter,u8 channel); -void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 5/16 staging: rtl8723bs: Remove function pointer hal_dm_watchdog
In reply to Philipp HortmannRemove function pointer hal_dm_watchdog and use rtl8723b_HalDmWatchDog directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -285,8 +285,7 @@ void rtw_hal_set_chnl_bw(struct adapter *padapter, u8 channel,void rtw_hal_dm_watchdog (struct adapter *padapter) { -if (padapter->HalFunc.hal_dm_watchdog) - padapter->HalFunc.hal_dm_watchdog (padapter); +rtl8723b_HalDmWatchDog (padapter); }void rtw_hal_dm_watchdog_in_lps (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->hal_dm_watchdog = &rtl8723b_HalDmWatchDog; pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter);void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);
Signature · 1 line
2.43.0
PATCH 6/16 staging: rtl8723bs: Remove function pointer hal_dm_watchdog_in_lps
In reply to Philipp HortmannRemove function pointer hal_dm_watchdog_in_lps and use rtl8723b_HalDmWatchDog_in_LPS directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 --- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -291,8 +291,7 @@ 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 (padapter->HalFunc.hal_dm_watchdog_in_lps) - padapter->HalFunc.hal_dm_watchdog_in_lps (padapter);/* this function caller is in interrupt context */ +rtl8723b_HalDmWatchDog_in_LPS (padapter);/* this function caller is in interrupt context */ } }
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -3
@@ -1744,9 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->hal_dm_watchdog_in_lps = &rtl8723b_HalDmWatchDog_in_LPS; - - pHalFunc->SetBeaconRelatedRegistersHandler = &rtl8723b_SetBeaconRelatedRegisters; pHalFunc->Add_RateATid = &rtl8723b_Add_RateATid;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {typedef s32 (*c2h_id_filter )(u8 *c2h_evt);struct hal_ops { -void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); -void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 7/16 staging: rtl8723bs: Remove function pointer SetBeaconRelatedRegistersHandler
In reply to Philipp HortmannRemove function pointer SetBeaconRelatedRegistersHandler and use rtl8723b_SetBeaconRelatedRegisters directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 +--- drivers/staging/rtl8723bs/include/hal_intf.h | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -297,8 +297,7 @@ void rtw_hal_dm_watchdog_in_lps(struct adapter *padapter)void beacon_timing_control (struct adapter *padapter) { -if (padapter->HalFunc.SetBeaconRelatedRegistersHandler) - padapter->HalFunc.SetBeaconRelatedRegistersHandler (padapter); +rtl8723b_SetBeaconRelatedRegisters (padapter); }
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -3
@@ -1625,7 +1625,7 @@ static void _BeaconFunctionEnable(struct adapter *padapter, u8 Enable, u8 Linkedrtw_write8 (padapter,REG_RD_CTRL +1 ,0x6F ); } -static void rtl8723b_SetBeaconRelatedRegisters (struct adapter *padapter) +void rtl8723b_SetBeaconRelatedRegisters (struct adapter *padapter) {u8 val8;u32 value32;
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->SetBeaconRelatedRegistersHandler = &rtl8723b_SetBeaconRelatedRegisters; - pHalFunc->Add_RateATid = &rtl8723b_Add_RateATid; pHalFunc->run_thread = &rtl8723b_start_thread;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -2
@@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*SetBeaconRelatedRegistersHandler)(struct adapter *padapter); -void (*Add_RateATid)(struct adapter *padapter,u32 bitmap,u8 *arg,u8 rssi_level);void (*run_thread)(struct adapter *padapter);
@@ -300,4 +298,5 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int lu8 GetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue);u8 SetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue);void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level); +void rtl8723b_SetBeaconRelatedRegisters (struct adapter *padapter);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 8/16 staging: rtl8723bs: Remove function pointer Add_RateATid
In reply to Philipp HortmannRemove function pointer Add_RateATid and use rtl8723b_Add_RateATid directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -227,8 +227,7 @@ void rtw_hal_update_ra_mask(struct sta_info *psta, u8 rssi_level)void rtw_hal_add_ra_tid (struct adapter *padapter,u32 bitmap,u8 *arg,u8 rssi_level) { -if (padapter->HalFunc.Add_RateATid) - padapter->HalFunc.Add_RateATid (padapter, bitmap, arg, rssi_level); +rtl8723b_Add_RateATid (padapter, bitmap, arg, rssi_level); }/*Start specifical interface thread */
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->Add_RateATid = &rtl8723b_Add_RateATid; - pHalFunc->run_thread = &rtl8723b_start_thread; pHalFunc->cancel_thread = &rtl8723b_stop_thread;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*Add_RateATid)(struct adapter *padapter,u32 bitmap,u8 *arg,u8 rssi_level); -void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 9/16 staging: rtl8723bs: Remove function pointer run_thread
In reply to Philipp HortmannRemove function pointer run_thread and use rtl8723b_start_thread directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -233,8 +233,7 @@ void rtw_hal_add_ra_tid(struct adapter *padapter, u32 bitmap, u8 *arg, u8 rssi_l/*Start specifical interface thread */ void rtw_hal_start_thread (struct adapter *padapter) { -if (padapter->HalFunc.run_thread) - padapter->HalFunc.run_thread (padapter); +rtl8723b_start_thread (padapter); }/*Start specifical interface thread */ void rtw_hal_stop_thread (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->run_thread = &rtl8723b_start_thread; pHalFunc->cancel_thread = &rtl8723b_stop_thread; pHalFunc->read_bbreg = &PHY_QueryBBReg_8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter);u32 (*read_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask);
Signature · 1 line
2.43.0
PATCH 10/16 staging: rtl8723bs: Remove function pointer cancel_thread
In reply to Philipp HortmannRemove function pointer cancel_thread and use rtl8723b_stop_thread directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -238,8 +238,7 @@ void rtw_hal_start_thread(struct adapter *padapter)/*Start specifical interface thread */ void rtw_hal_stop_thread (struct adapter *padapter) { -if (padapter->HalFunc.cancel_thread) - padapter->HalFunc.cancel_thread (padapter); +rtl8723b_stop_thread (padapter); }u32 rtw_hal_read_bbreg (struct adapter *padapter,u32 RegAddr,u32 BitMask)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->cancel_thread = &rtl8723b_stop_thread; - pHalFunc->read_bbreg = &PHY_QueryBBReg_8723B; pHalFunc->write_bbreg = &PHY_SetBBReg_8723B; pHalFunc->read_rfreg = &PHY_QueryRFReg_8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*cancel_thread)(struct adapter *padapter); -u32 (*read_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask);void (*write_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data);u32 (*read_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask);
Signature · 1 line
2.43.0
PATCH 11/16 staging: rtl8723bs: Remove function pointer read_bbreg
In reply to Philipp HortmannRemove function pointer read_bbreg and use PHY_QueryBBReg_8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +----- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -5
@@ -243,11 +243,7 @@ void rtw_hal_stop_thread(struct adapter *padapter)u32 rtw_hal_read_bbreg (struct adapter *padapter,u32 RegAddr,u32 BitMask) { -u32 data =0 ; - -if (padapter->HalFunc.read_bbreg) - data = padapter->HalFunc.read_bbreg (padapter, RegAddr, BitMask); -return data; +return PHY_QueryBBReg_8723B (padapter, RegAddr, BitMask); }void rtw_hal_write_bbreg (struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data) {
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->read_bbreg = &PHY_QueryBBReg_8723B; pHalFunc->write_bbreg = &PHY_SetBBReg_8723B; pHalFunc->read_rfreg = &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg = &PHY_SetRFReg_8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -u32 (*read_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask);void (*write_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data);u32 (*read_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask);void (*write_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask,u32 Data);
drivers/staging/rtl8723bs/include/rtw_mp.h +0 -1
@@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u3u32 read_macreg (struct adapter *padapter,u32 addr,u32 sz);void write_macreg (struct adapter *padapter,u32 addr,u32 val,u32 sz); -u32 read_bbreg (struct adapter *padapter,u32 addr,u32 bitmask);void write_bbreg (struct adapter *padapter,u32 addr,u32 bitmask,u32 val);u32 read_rfreg (struct adapter *padapter,u8 rfpath,u32 addr);void write_rfreg (struct adapter *padapter,u8 rfpath,u32 addr,u32 val);
Signature · 1 line
2.43.0
PATCH 12/16 staging: rtl8723bs: Remove function pointer write_bbreg
In reply to Philipp HortmannRemove function pointer write_bbreg and use PHY_SetBBReg_8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 5 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -247,8 +247,7 @@ u32 rtw_hal_read_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask) }void rtw_hal_write_bbreg (struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data) { -if (padapter->HalFunc.write_bbreg) - padapter->HalFunc.write_bbreg (padapter, RegAddr, BitMask, Data); +PHY_SetBBReg_8723B (padapter, RegAddr, BitMask, Data); }u32 rtw_hal_read_rfreg (struct adapter *padapter,u32 eRFPath,u32 RegAddr,u32 BitMask)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->write_bbreg = &PHY_SetBBReg_8723B; pHalFunc->read_rfreg = &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg = &PHY_SetRFReg_8723B;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*write_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask,u32 Data);u32 (*read_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask);void (*write_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask,u32 Data);
drivers/staging/rtl8723bs/include/rtw_mp.h +0 -1
@@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u3u32 read_macreg (struct adapter *padapter,u32 addr,u32 sz);void write_macreg (struct adapter *padapter,u32 addr,u32 val,u32 sz); -void write_bbreg (struct adapter *padapter,u32 addr,u32 bitmask,u32 val);u32 read_rfreg (struct adapter *padapter,u8 rfpath,u32 addr);void write_rfreg (struct adapter *padapter,u8 rfpath,u32 addr,u32 val);
Signature · 1 line
2.43.0
PATCH 13/16 staging: rtl8723bs: Remove function pointer read_rfreg
In reply to Philipp HortmannRemove function pointer read_rfreg and use PHY_QueryRFReg_8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +----- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -5
@@ -252,11 +252,7 @@ void rtw_hal_write_bbreg(struct adapter *padapter, u32 RegAddr, u32 BitMask, u32u32 rtw_hal_read_rfreg (struct adapter *padapter,u32 eRFPath,u32 RegAddr,u32 BitMask) { -u32 data =0 ; - -if (padapter->HalFunc.read_rfreg) - data = padapter->HalFunc.read_rfreg (padapter, eRFPath, RegAddr, BitMask); -return data; +return PHY_QueryRFReg_8723B (padapter, eRFPath, RegAddr, BitMask); }void rtw_hal_write_rfreg (struct adapter *padapter,u32 eRFPath,u32 RegAddr,u32 BitMask,u32 Data) {
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
@@ -1744,7 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->read_rfreg = &PHY_QueryRFReg_8723B; pHalFunc->write_rfreg = &PHY_SetRFReg_8723B;/* Efuse related function */
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -u32 (*read_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask);void (*write_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask,u32 Data);void (*EfusePowerSwitch)(struct adapter *padapter,u8 bWrite,u8 PwrState);
drivers/staging/rtl8723bs/include/rtw_mp.h +0 -1
@@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u3u32 read_macreg (struct adapter *padapter,u32 addr,u32 sz);void write_macreg (struct adapter *padapter,u32 addr,u32 val,u32 sz); -u32 read_rfreg (struct adapter *padapter,u8 rfpath,u32 addr);void write_rfreg (struct adapter *padapter,u8 rfpath,u32 addr,u32 val);void SetChannel (struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 14/16 staging: rtl8723bs: Remove function pointer write_rfreg
In reply to Philipp HortmannRemove function pointer write_rfreg and use PHY_SetRFReg_8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 -- drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- drivers/staging/rtl8723bs/include/rtw_mp.h | 1 - 4 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -256,8 +256,7 @@ u32 rtw_hal_read_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32 B }void rtw_hal_write_rfreg (struct adapter *padapter,u32 eRFPath,u32 RegAddr,u32 BitMask,u32 Data) { -if (padapter->HalFunc.write_rfreg) - padapter->HalFunc.write_rfreg (padapter, eRFPath, RegAddr, BitMask, Data); +PHY_SetRFReg_8723B (padapter, eRFPath, RegAddr, BitMask, Data); }void rtw_hal_set_chan (struct adapter *padapter,u8 channel)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -2
@@ -1744,8 +1744,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) { - pHalFunc->write_rfreg = &PHY_SetRFReg_8723B; -/* Efuse related function */ pHalFunc->EfusePowerSwitch = &Hal_EfusePowerSwitch; pHalFunc->ReadEFuse = &Hal_ReadEFuse;
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -164,8 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*write_rfreg)(struct adapter *padapter,u8 eRFPath,u32 RegAddr,u32 BitMask,u32 Data); -void (*EfusePowerSwitch)(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);
drivers/staging/rtl8723bs/include/rtw_mp.h +0 -1
@@ -276,7 +276,6 @@ void _write_rfreg(struct adapter *padapter, u8 rfpath, u32 addr, u32 bitmask, u3u32 read_macreg (struct adapter *padapter,u32 addr,u32 sz);void write_macreg (struct adapter *padapter,u32 addr,u32 val,u32 sz); -void write_rfreg (struct adapter *padapter,u8 rfpath,u32 addr,u32 val);void SetChannel (struct adapter *padapter);void SetBandwidth (struct adapter *padapter);
Signature · 1 line
2.43.0
PATCH 15/16 staging: rtl8723bs: Remove function pointer EfusePowerSwitch
In reply to Philipp HortmannRemove function pointer EfusePowerSwitch and use Hal_EfusePowerSwitch directly to increase readability.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +1 -1
@@ -77,7 +77,7 @@ struct adapter *padapter,u8 bWrite, u8 PwrState) { - padapter->HalFunc.EfusePowerSwitch (padapter, bWrite, PwrState); +Hal_EfusePowerSwitch (padapter ,bWrite ,PwrState ); }/*-----------------------------------------------------------------------------
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -602,7 +602,7 @@ 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_EfusePowerSwitch ( +void Hal_EfusePowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState ) {
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->EfusePowerSwitch = &Hal_EfusePowerSwitch; pHalFunc->ReadEFuse = &Hal_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -void (*EfusePowerSwitch)(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);
@@ -289,4 +288,5 @@ u8 GetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eVariablu8 SetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue);void UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level);void rtl8723b_SetBeaconRelatedRegisters (struct adapter *padapter); +void Hal_EfusePowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 16/16 staging: rtl8723bs: Remove function pointer ReadEFuse
In reply to Philipp HortmannRemove function pointer ReadEFuse and use Hal_ReadEFuse directly to increase readability.
--- drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_efuse.c +1 -1
@@ -159,7 +159,7 @@ efuse_ReadEFuse(bool bPseudoTest ) { - Adapter->HalFunc.ReadEFuse (Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); +Hal_ReadEFuse (Adapter, efuseType, _offset, _size_byte, pbuf, bPseudoTest); }void
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +1 -2
@@ -887,7 +887,7 @@ static void hal_ReadEFuse_BT(kfree (efuseTbl); } -static void Hal_ReadEFuse( +void Hal_ReadEFuse( struct adapter *padapter, u8 efuseType, u16 _offset,
@@ -1745,7 +1745,6 @@ void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_level)void rtl8723b_set_hal_ops (struct hal_ops *pHalFunc) {/* Efuse related function */ - pHalFunc->ReadEFuse = &Hal_ReadEFuse; pHalFunc->EFUSEGetEfuseDefinition = &Hal_GetEfuseDefinition; pHalFunc->EfuseGetCurrentSize = &Hal_EfuseGetCurrentSize; pHalFunc->Efuse_PgPacketRead = &Hal_EfusePgPacketRead;
drivers/staging/rtl8723bs/include/hal_intf.h +2 -1
@@ -164,7 +164,6 @@ typedef s32 (*c2h_id_filter)(u8 *c2h_evt);struct hal_ops {void (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet); -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);int (*Efuse_PgPacketRead)(struct adapter *padapter,u8 offset,u8 *data,bool bPseudoTest);
@@ -289,4 +288,6 @@ u8 SetHalDefVar8723BSDIO(struct adapter *Adapter, enum hal_def_variable eVariablvoid UpdateHalRAMask8723B (struct adapter *padapter,u32 mac_id,u8 rssi_level);void rtl8723b_SetBeaconRelatedRegisters (struct adapter *padapter);void Hal_EfusePowerSwitch (struct adapter *padapter,u8 bWrite,u8 PwrState); +void Hal_ReadEFuse (struct adapter *padapter,u8 efuseType,u16 _offset, +u16 _size_byte,u8 *pbuf,bool bPseudoTest);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0