staging: rtl8723bs: Replace function pointers and #if 1
cover staging: rtl8723bs: Replace function pointers and #if 1
Replace function pointers with functions to increase readability. Remove dead code resulting from #if 1.
Replace one function that just contains one line to increase readability.
Tested with rtl8723bs in ODYS Trendbook Next 14
Philipp Hortmann (13):
staging: rtl8723bs: Replace function thread_enter
staging: rtl8723bs: Remove #if 1 in function
hal_EfusePartialWriteCheck
staging: rtl8723bs: Remove #if 1 in function
hal_EfuseGetCurrentSize_BT
staging: rtl8723bs: Remove #if 1 in function ReadChipVersion8723B
staging: rtl8723bs: Remove function pointer check_ips_status
staging: rtl8723bs: Remove function pointer SetHwRegHandler
staging: rtl8723bs: Remove function pointer GetHwRegHandler
staging: rtl8723bs: Remove function pointer SetHwRegHandlerWithBuf
staging: rtl8723bs: Remove function pointer GetHalDefVarHandler
staging: rtl8723bs: Remove function pointer SetHalDefVarHandler
staging: rtl8723bs: Remove function pointer hal_xmit
staging: rtl8723bs: Remove function pointer mgnt_xmit
staging: rtl8723bs: Remove function pointer hal_xmitframe_enqueue
drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- .../staging/rtl8723bs/core/rtw_wlan_util.c | 4 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/hal_intf.c | 40 ++------- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 85 +------------------ .../staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 21 ++--- drivers/staging/rtl8723bs/include/hal_intf.h | 22 ++--- .../staging/rtl8723bs/include/osdep_service.h | 5 -- 10 files changed, 27 insertions(+), 160 deletions(-)
Signature · 1 line
2.43.0
PATCH 1/13 staging: rtl8723bs: Replace function thread_enter
Replace function thread_enter with its only called function allow_signal to increase readability. Remove resulting unused local variable thread_name as well.
--- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 4 +--- drivers/staging/rtl8723bs/include/osdep_service.h | 5 ----- 4 files changed, 3 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/core/rtw_cmd.c +1 -1
@@ -382,7 +382,7 @@ int rtw_cmd_thread(void *context)struct cmd_priv *pcmdpriv = &padapter->cmdpriv;struct drvextra_cmd_parm *extra_parm =NULL ; -thread_enter ("RTW_CMD_THREAD" ); +allow_signal (SIGTERM ); pcmdbuf = pcmdpriv->cmd_buf;
drivers/staging/rtl8723bs/core/rtw_xmit.c +1 -1
@@ -2489,7 +2489,7 @@ int rtw_xmit_thread(void *context) err = _SUCCESS; padapter = context; -thread_enter ("RTW_XMIT_THREAD" ); +allow_signal (SIGTERM ); do { err = rtw_hal_xmit_thread_handler(padapter);
drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c +1 -3
@@ -411,14 +411,12 @@ int rtl8723bs_xmit_thread(void *context)s32 ret;struct adapter *padapter;struct xmit_priv *pxmitpriv; -u8 thread_name[20 ]; ret = _SUCCESS; padapter = context; pxmitpriv = &padapter->xmitpriv; -rtw_sprintf (thread_name,20 ,"RTWHALXT-%s" ,ADPT_ARG (padapter)); -thread_enter (thread_name); +allow_signal (SIGTERM ); do { ret = rtl8723bs_xmit_handler(padapter);
drivers/staging/rtl8723bs/include/osdep_service.h +0 -5
@@ -73,11 +73,6 @@ int _rtw_netif_rx(struct net_device *ndev, struct sk_buff *skb);extern void _rtw_init_queue (struct __queue *pqueue); -static inline void thread_enter (char *name) -{ -allow_signal (SIGTERM ); -} -static inline void flush_signals_thread (void ) {if (signal_pending (current))
Signature · 1 line
2.43.0
PATCH 2/13 staging: rtl8723bs: Remove #if 1 in function hal_EfusePartialWriteCheck
In reply to Philipp HortmannRemove #if 1 in function hal_EfusePartialWriteCheck to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 53 ------------------- 1 file changed, 53 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -53
@@ -1327,61 +1327,8 @@ static u8 hal_EfusePartialWriteCheck( }if (efuse_OneByteRead (padapter, startAddr, &efuse_data, bPseudoTest) && (efuse_data !=0xFF )) { -#if 1 bRet = false;break ; -#else -if (EXT_HEADER (efuse_data)) { - cur_header = efuse_data; - startAddr++; -efuse_OneByteRead (padapter, startAddr, &efuse_data, bPseudoTest); -if (ALL_WORDS_DISABLED (efuse_data)) { - bRet = false; -break ; - }else { - curPkt.offset = ((cur_header &0xE0 ) >>5 ) | ((efuse_data &0xF0 ) >>1 ); - curPkt.word_en = efuse_data &0x0F ; - } - }else { - cur_header = efuse_data; - curPkt.offset = (cur_header>>4 ) &0x0F ; - curPkt.word_en = cur_header &0x0F ; - } - - curPkt.word_cnts =Efuse_CalculateWordCnts (curPkt.word_en); -/* if same header is found but no data followed */ -/* write some part of data followed by the header. */ -if ( - (curPkt.offset == pTargetPkt->offset) && - (hal_EfuseCheckIfDatafollowed (padapter, curPkt.word_cnts, startAddr+1 , bPseudoTest) == false) && -wordEnMatched (pTargetPkt, &curPkt, &matched_wden) == true - ) { -/* Here to write partial data */ - badworden =Efuse_WordEnableDataWrite (padapter, startAddr+1 , matched_wden, pTargetPkt->data, bPseudoTest); -if (badworden !=0x0F ) { -u32 PgWriteSuccess =0 ; -/* if write fail on some words, write these bad words again */ -if (efuseType ==EFUSE_WIFI ) - PgWriteSuccess =Efuse_PgPacketWrite (padapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); -else - PgWriteSuccess =Efuse_PgPacketWrite_BT (padapter, pTargetPkt->offset, badworden, pTargetPkt->data, bPseudoTest); - -if (!PgWriteSuccess) { - bRet = false;/* write fail, return */ -break ; - } - } -/* partial write ok, update the target packet for later use */ -for (i =0 ; i <4 ; i++) { -if ((matched_wden & (0x1 <<i)) ==0 ) {/* this word has been written */ - pTargetPkt->word_en |= (0x1 <<i);/* disable the word */ - } - } - pTargetPkt->word_cnts =Efuse_CalculateWordCnts (pTargetPkt->word_en); - } -/* read from next header */ - startAddr = startAddr + (curPkt.word_cnts*2 ) +1 ; -#endif }else {/* not used header, 0xff */ *pAddr = startAddr;
Signature · 1 line
2.43.0
PATCH 3/13 staging: rtl8723bs: Remove #if 1 in function hal_EfuseGetCurrentSize_BT
In reply to Philipp HortmannRemove #if 1 in function hal_EfuseGetCurrentSize_BT to shorten code.
--- .../staging/rtl8723bs/hal/rtl8723b_hal_init.c | 28 ------------------- 1 file changed, 28 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -28
@@ -1028,7 +1028,6 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)/* only when bank is switched we have to reset the efuse_addr. */ if (bank != startBank) efuse_addr =0 ; -#if 1 while (AVAILABLE_EFUSE_ADDR (efuse_addr)) { if (efuse_OneByteRead(padapter, efuse_addr,
@@ -1057,33 +1056,6 @@ static u16 hal_EfuseGetCurrentSize_BT(struct adapter *padapter, u8 bPseudoTest)/* read next header */ efuse_addr += (word_cnts*2 )+1 ; } -#else -while ( - bContinual && -efuse_OneByteRead (padapter, efuse_addr, &efuse_data, bPseudoTest) && -AVAILABLE_EFUSE_ADDR (efuse_addr) - ) { -if (efuse_data !=0xFF ) { -if ((efuse_data&0x1F ) ==0x0F ) {/* extended header */ - efuse_addr++; -efuse_OneByteRead (padapter, efuse_addr, &efuse_data, bPseudoTest); -if ((efuse_data &0x0F ) ==0x0F ) { - efuse_addr++; -continue ; - }else { - hworden = efuse_data &0x0F ; - } - }else { - hworden = efuse_data &0x0F ; - } - word_cnts =Efuse_CalculateWordCnts (hworden); -/* read next header */ - efuse_addr = efuse_addr + (word_cnts*2 )+1 ; - }else - bContinual = false; - } -#endif -/* Check if we need to check next bank efuse */ if (efuse_addr < retU2)
Signature · 1 line
2.43.0
PATCH 4/13 staging: rtl8723bs: Remove #if 1 in function ReadChipVersion8723B
In reply to Philipp HortmannRemove #if 1 in function ReadChipVersion8723B as it is useless.
--- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +2 -2
@@ -1523,9 +1523,9 @@ static struct hal_version ReadChipVersion8723B(struct adapter *padapter) pHalData->MultiFunc |= ((value32 &BT_FUNC_EN ) ?RT_MULTI_FUNC_BT :0 ); pHalData->MultiFunc |= ((value32 &GPS_FUNC_EN ) ?RT_MULTI_FUNC_GPS :0 ); pHalData->PolarityCtl = ((value32 &WL_HWPDN_SL ) ?RT_POLARITY_HIGH_ACT :RT_POLARITY_LOW_ACT ); -#if 1 +dump_chip_info (ChipVersion); -#endif + pHalData->VersionID = ChipVersion;return ChipVersion;
Signature · 1 line
2.43.0
PATCH 5/13 staging: rtl8723bs: Remove function pointer check_ips_status
In reply to Philipp HortmannRemove function pointer check_ips_status and use CheckIPSStatus directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 7 +------ drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -6
@@ -156,12 +156,7 @@ void rtw_hal_disable_interrupt(struct adapter *padapter)u8 rtw_hal_check_ips_status (struct adapter *padapter) { -u8 val = false; - -if (padapter->HalFunc.check_ips_status) - val = padapter->HalFunc.check_ips_status (padapter); - -return val; +return CheckIPSStatus (padapter); }s32 rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->check_ips_status = &CheckIPSStatus; pHalFunc->SetHwRegHandler = &SetHwReg8723BS; pHalFunc->GetHwRegHandler = &GetHwReg8723BS; pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B;
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 { -u8 (*check_ips_status)(struct adapter *padapter);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);
Signature · 1 line
2.43.0
PATCH 6/13 staging: rtl8723bs: Remove function pointer SetHwRegHandler
In reply to Philipp HortmannRemove function pointer SetHwRegHandler and use SetHwReg8723BS directly to increase readability.
--- drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 4 ++-- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -5637,7 +5637,7 @@ u8 setkey_hdl(struct adapter *padapter, u8 *pbuf)rtw_hal_set_hwreg (padapter,HW_VAR_SEC_DK_CFG , (u8 *)true);/* allow multicast packets to driver */ - padapter->HalFunc.SetHwRegHandler (padapter,HW_VAR_ON_RCR_AM , null_addr); +SetHwReg8723BS (padapter,HW_VAR_ON_RCR_AM , null_addr);return H2C_SUCCESS ; }
drivers/staging/rtl8723bs/core/rtw_wlan_util.c +2 -2
@@ -1575,9 +1575,9 @@ void update_wireless_mode(struct adapter *padapter) SIFS_Timer =0x0a0a0808 ;/* 0x0808 -> for CCK, 0x0a0a -> for OFDM */ /* change this value if having IOT issues. */ - padapter->HalFunc.SetHwRegHandler (padapter,HW_VAR_RESP_SIFS , (u8 *)&SIFS_Timer); +SetHwReg8723BS (padapter,HW_VAR_RESP_SIFS , (u8 *)&SIFS_Timer); - padapter->HalFunc.SetHwRegHandler (padapter,HW_VAR_WIRELESS_MODE , (u8 *)&(pmlmeext->cur_wireless_mode)); +SetHwReg8723BS (padapter,HW_VAR_WIRELESS_MODE , (u8 *)&(pmlmeext->cur_wireless_mode));if (pmlmeext->cur_wireless_mode &WIRELESS_11B )update_mgnt_tx_rate (padapter,IEEE80211_CCK_RATE_1MB );
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -108,8 +108,7 @@ uint rtw_hal_deinit(struct adapter *padapter)void rtw_hal_set_hwreg (struct adapter *padapter,u8 variable,u8 *val) { -if (padapter->HalFunc.SetHwRegHandler) - padapter->HalFunc.SetHwRegHandler (padapter, variable, val); +SetHwReg8723BS (padapter, variable, val); }void rtw_hal_get_hwreg (struct adapter *padapter,u8 variable,u8 *val)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -1144,7 +1144,7 @@ void ReadAdapterInfo8723BS(struct adapter *padapter)* If variable not handled here, * some variables will be processed in SetHwReg8723B() */ -static void SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val) +void SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val) {u8 val8;
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->SetHwRegHandler = &SetHwReg8723BS; pHalFunc->GetHwRegHandler = &GetHwReg8723BS; pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8723BSDIO;
drivers/staging/rtl8723bs/include/hal_intf.h +2 -2
@@ -170,8 +170,6 @@ struct hal_ops {void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); - -void (*SetHwRegHandler)(struct adapter *padapter,u8 variable,u8 *val);void (*GetHwRegHandler)(struct adapter *padapter,u8 variable,u8 *val);void (*SetHwRegHandlerWithBuf)(struct adapter *padapter,u8 variable,u8 *pbuf,int len);
@@ -319,4 +317,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 macid);s32 rtw_hal_fill_h2c_cmd (struct adapter *,u8 ElementID,u32 CmdLen,u8 *pCmdBuffer); +void SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val); +#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 7/13 staging: rtl8723bs: Remove function pointer GetHwRegHandler
In reply to Philipp HortmannRemove function pointer GetHwRegHandler and use GetHwReg8723BS directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -113,8 +113,7 @@ void rtw_hal_set_hwreg(struct adapter *padapter, u8 variable, u8 *val)void rtw_hal_get_hwreg (struct adapter *padapter,u8 variable,u8 *val) { -if (padapter->HalFunc.GetHwRegHandler) - padapter->HalFunc.GetHwRegHandler (padapter, variable, val); +GetHwReg8723BS (padapter, variable, val); }void rtw_hal_set_hwreg_with_buf (struct adapter *padapter,u8 variable,u8 *pbuf,int len)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -1185,7 +1185,7 @@ void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val)* If variable not handled here, * some variables will be processed in GetHwReg8723B() */ -static void GetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val) +void GetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val) {switch (variable) {case HW_VAR_CPWM :
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->GetHwRegHandler = &GetHwReg8723BS; pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8723BSDIO; pHalFunc->SetHalDefVarHandler = &SetHalDefVar8723BSDIO;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -2
@@ -170,8 +170,6 @@ struct hal_ops {void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); -void (*GetHwRegHandler)(struct adapter *padapter,u8 variable,u8 *val); -void (*SetHwRegHandlerWithBuf)(struct adapter *padapter,u8 variable,u8 *pbuf,int len);u8 (*GetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue);
@@ -318,5 +316,6 @@ s32 rtw_hal_macid_wakeup(struct adapter *padapter, u32 macid);s32 rtw_hal_fill_h2c_cmd (struct adapter *,u8 ElementID,u32 CmdLen,u8 *pCmdBuffer);void SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val); +void GetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 8/13 staging: rtl8723bs: Remove function pointer SetHwRegHandlerWithBuf
In reply to Philipp HortmannRemove function pointer SetHwRegHandlerWithBuf and use SetHwRegWithBuf8723B directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +-- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 4 +--- 3 files changed, 3 insertions(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -2
@@ -118,8 +118,7 @@ void rtw_hal_get_hwreg(struct adapter *padapter, u8 variable, u8 *val)void rtw_hal_set_hwreg_with_buf (struct adapter *padapter,u8 variable,u8 *pbuf,int len) { -if (padapter->HalFunc.SetHwRegHandlerWithBuf) - padapter->HalFunc.SetHwRegHandlerWithBuf (padapter, variable, pbuf, len); +SetHwRegWithBuf8723B (padapter, variable, pbuf, len); }u8 rtw_hal_set_def_var (struct adapter *padapter,enum hal_def_variable eVariable,void *pValue)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -1204,7 +1204,7 @@ void GetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val) } } -static void SetHwRegWithBuf8723B (struct adapter *padapter,u8 variable,u8 *pbuf,int len) +void SetHwRegWithBuf8723B (struct adapter *padapter,u8 variable,u8 *pbuf,int len) {switch (variable) {case HW_VAR_C2H_HANDLE :
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->SetHwRegHandlerWithBuf = &SetHwRegWithBuf8723B; pHalFunc->GetHalDefVarHandler = &GetHalDefVar8723BSDIO; pHalFunc->SetHalDefVarHandler = &SetHalDefVar8723BSDIO;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -3
@@ -170,8 +170,6 @@ struct hal_ops {void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); -void (*SetHwRegHandlerWithBuf)(struct adapter *padapter,u8 variable,u8 *pbuf,int len); -u8 (*GetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue);u8 (*SetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue);
@@ -317,5 +315,5 @@ s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *pCmdBufvoid SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val);void GetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val); - +void SetHwRegWithBuf8723B (struct adapter *padapter,u8 variable,u8 *pbuf,int len);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 9/13 staging: rtl8723bs: Remove function pointer GetHalDefVarHandler
In reply to Philipp HortmannRemove function pointer GetHalDefVarHandler and use GetHalDefVar8723BSDIO directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 3 +-- drivers/staging/rtl8723bs/include/hal_intf.h | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -3
@@ -130,9 +130,7 @@ u8 rtw_hal_set_def_var(struct adapter *padapter, enum hal_def_variable eVariableu8 rtw_hal_get_def_var (struct adapter *padapter,enum hal_def_variable eVariable,void *pValue) { -if (padapter->HalFunc.GetHalDefVarHandler) -return padapter->HalFunc.GetHalDefVarHandler (padapter, eVariable, pValue); -return _FAIL; +return GetHalDefVar8723BSDIO (padapter, eVariable, pValue); }void rtw_hal_set_odm_var (struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -2
@@ -1219,7 +1219,7 @@ void SetHwRegWithBuf8723B(struct adapter *padapter, u8 variable, u8 *pbuf, int l/* Description: */ /* Query setting of specified variable. */ /* */ -static u8 GetHalDefVar8723BSDIO ( +u8 GetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue ) {
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->GetHalDefVarHandler = &GetHalDefVar8723BSDIO; pHalFunc->SetHalDefVarHandler = &SetHalDefVar8723BSDIO; pHalFunc->hal_xmit = &rtl8723bs_hal_xmit;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -1
@@ -170,7 +170,6 @@ struct hal_ops {void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); -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 (*SetHalODMVarHandler)(struct adapter *padapter,enum hal_odm_variable eVariable,void *pValue1,bool bSet);
@@ -316,4 +315,5 @@ s32 rtw_hal_fill_h2c_cmd(struct adapter *, u8 ElementID, u32 CmdLen, u8 *pCmdBufvoid SetHwReg8723BS (struct adapter *padapter,u8 variable,u8 *val);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);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 10/13 staging: rtl8723bs: Remove function pointer SetHalDefVarHandler
In reply to Philipp HortmannRemove function pointer SetHalDefVarHandler and use SetHalDefVar8723BSDIO directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 4 +--- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 +---- drivers/staging/rtl8723bs/include/hal_intf.h | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -3
@@ -123,9 +123,7 @@ void rtw_hal_set_hwreg_with_buf(struct adapter *padapter, u8 variable, u8 *pbuf,u8 rtw_hal_set_def_var (struct adapter *padapter,enum hal_def_variable eVariable,void *pValue) { -if (padapter->HalFunc.SetHalDefVarHandler) -return padapter->HalFunc.SetHalDefVarHandler (padapter, eVariable, pValue); -return _FAIL; +return SetHalDefVar8723BSDIO (padapter, eVariable, pValue); }u8 rtw_hal_get_def_var (struct adapter *padapter,enum hal_def_variable eVariable,void *pValue)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +1 -4
@@ -1247,8 +1247,7 @@ u8 GetHalDefVar8723BSDIO(/* Description: */ /* Change default setting of specified variable. */ /* */ -static u8 SetHalDefVar8723BSDIO (struct adapter *Adapter, -enum hal_def_variable eVariable,void *pValue) +u8 SetHalDefVar8723BSDIO (struct adapter *Adapter,enum hal_def_variable eVariable,void *pValue) {return SetHalDefVar8723B (Adapter, eVariable, pValue); }
@@ -1259,8 +1258,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->SetHalDefVarHandler = &SetHalDefVar8723BSDIO; - pHalFunc->hal_xmit = &rtl8723bs_hal_xmit; pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit; pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue;
drivers/staging/rtl8723bs/include/hal_intf.h +1 -2
@@ -170,8 +170,6 @@ struct hal_ops {void (*hal_dm_watchdog)(struct adapter *padapter);void (*hal_dm_watchdog_in_lps)(struct adapter *padapter); -u8 (*SetHalDefVarHandler)(struct adapter *padapter,enum hal_def_variable eVariable,void *pValue); -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);
@@ -316,4 +314,5 @@ void SetHwReg8723BS(struct adapter *padapter, u8 variable, u8 *val);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);#endif /* __HAL_INTF_H__ */
Signature · 1 line
2.43.0
PATCH 11/13 staging: rtl8723bs: Remove function pointer hal_xmit
In reply to Philipp HortmannRemove function pointer hal_xmit and use rtl8723bs_hal_xmit directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -4
@@ -162,10 +162,7 @@ s32 rtw_hal_xmitframe_enqueue(struct adapter *padapter, struct xmit_frame *pxmits32 rtw_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe) { -if (padapter->HalFunc.hal_xmit) -return padapter->HalFunc.hal_xmit (padapter, pxmitframe); - -return false; +return rtl8723bs_hal_xmit (padapter, pxmitframe); }/*
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1258,7 +1258,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->hal_xmit = &rtl8723bs_hal_xmit; pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit; pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue; }
drivers/staging/rtl8723bs/include/hal_intf.h +0 -1
@@ -180,7 +180,6 @@ struct hal_ops {void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter); -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 12/13 staging: rtl8723bs: Remove function pointer mgnt_xmit
In reply to Philipp HortmannRemove function pointer mgnt_xmit and use rtl8723bs_mgnt_xmit directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 6 +----- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 4 ---- 3 files changed, 1 insertion(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -5
@@ -170,8 +170,6 @@ s32 rtw_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe)*/ s32 rtw_hal_mgnt_xmit (struct adapter *padapter,struct xmit_frame *pmgntframe) { -s32 ret = _FAIL; -update_mgntframe_attrib_addr (padapter, pmgntframe);/* pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; */ /* pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; */
@@ -188,9 +186,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)rtw_mgmt_xmitframe_coalesce (padapter, pmgntframe->pkt, pmgntframe); } -if (padapter->HalFunc.mgnt_xmit) - ret = padapter->HalFunc.mgnt_xmit (padapter, pmgntframe); -return ret; +return rtl8723bs_mgnt_xmit (padapter, pmgntframe); }s32 rtw_hal_init_xmit_priv (struct adapter *padapter)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1258,6 +1258,5 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->mgnt_xmit = &rtl8723bs_mgnt_xmit; pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue; }
drivers/staging/rtl8723bs/include/hal_intf.h +0 -4
@@ -180,10 +180,6 @@ struct hal_ops {void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter); -/* -* mgnt_xmit should be implemented to run in interrupt context -*/ -s32 (*mgnt_xmit)(struct adapter *padapter,struct xmit_frame *pmgntframe);s32 (*hal_xmitframe_enqueue)(struct adapter *padapter,struct xmit_frame *pxmitframe);u32 (*read_bbreg)(struct adapter *padapter,u32 RegAddr,u32 BitMask);
Signature · 1 line
2.43.0
PATCH 13/13 staging: rtl8723bs: Remove function pointer hal_xmitframe_enqueue
In reply to Philipp HortmannRemove function pointer hal_xmitframe_enqueue and use rtl8723bs_hal_xmitframe_enqueue directly to increase readability.
--- drivers/staging/rtl8723bs/hal/hal_intf.c | 5 +---- drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1 - drivers/staging/rtl8723bs/include/hal_intf.h | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-)
drivers/staging/rtl8723bs/hal/hal_intf.c +1 -4
@@ -154,10 +154,7 @@ u8 rtw_hal_check_ips_status(struct adapter *padapter)s32 rtw_hal_xmitframe_enqueue (struct adapter *padapter,struct xmit_frame *pxmitframe) { -if (padapter->HalFunc.hal_xmitframe_enqueue) -return padapter->HalFunc.hal_xmitframe_enqueue (padapter, pxmitframe); - -return false; +return rtl8723bs_hal_xmitframe_enqueue (padapter, pxmitframe); }s32 rtw_hal_xmit (struct adapter *padapter,struct xmit_frame *pxmitframe)
drivers/staging/rtl8723bs/hal/sdio_halinit.c +0 -1
@@ -1258,5 +1258,4 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)rtl8723b_set_hal_ops (pHalFunc); - pHalFunc->hal_xmitframe_enqueue = &rtl8723bs_hal_xmitframe_enqueue; }
drivers/staging/rtl8723bs/include/hal_intf.h +0 -2
@@ -180,8 +180,6 @@ struct hal_ops {void (*run_thread)(struct adapter *padapter);void (*cancel_thread)(struct adapter *padapter); -s32 (*hal_xmitframe_enqueue)(struct adapter *padapter,struct xmit_frame *pxmitframe); -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