staging: rtl8723bs: Remove function pointer SetHwRegHandler

Remove function pointer SetHwRegHandler and use SetHwReg8723BS directly
to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/5682bb8d6951e903d23c98615e2fc6bd463b0ba4.1730619982.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Philipp Hortmann
2024-11-03 09:14:27 +01:00
committed by Greg Kroah-Hartman
parent b7f46dfabc
commit 5d28dfca5d
5 changed files with 7 additions and 9 deletions

View File

@@ -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;
}

View File

@@ -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);

View File

@@ -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)

View File

@@ -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;

View File

@@ -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__ */