diff options
| author | Philipp Hortmann <philipp.g.hortmann@gmail.com> | 2024-11-05 08:54:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-11-07 11:29:50 +0300 |
| commit | 4e1ddd1ff18ac660cd68dade8b84c9b82c648fc2 (patch) | |
| tree | 2bb65e91e78540371f8f636324e99b22096c1dc6 | |
| parent | 2ca601a795d2e7ea524f58deef9ff19ee7999bdb (diff) | |
| download | linux-4e1ddd1ff18ac660cd68dade8b84c9b82c648fc2.tar.xz | |
staging: rtl8723bs: Remove function pointer SetBeaconRelatedRegistersHandler
Remove function pointer SetBeaconRelatedRegistersHandler and use
rtl8723b_SetBeaconRelatedRegisters directly to increase readability.
Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/4c5eb3b6e6ad0015c97d89df637253318c18b520.1730749680.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/hal_intf.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/hal_intf.h | 3 |
3 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c index f3666b26ffe1..483f0c163bef 100644 --- a/drivers/staging/rtl8723bs/hal/hal_intf.c +++ b/drivers/staging/rtl8723bs/hal/hal_intf.c @@ -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); } diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 844ef4a80ad0..64eb1786d8db 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -1625,7 +1625,7 @@ static void _BeaconFunctionEnable(struct adapter *padapter, u8 Enable, u8 Linked rtw_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; diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h index 1e2bed9ebeef..2df25c1e7b5d 100644 --- a/drivers/staging/rtl8723bs/include/hal_intf.h +++ b/drivers/staging/rtl8723bs/include/hal_intf.h @@ -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 l 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); +void rtl8723b_SetBeaconRelatedRegisters(struct adapter *padapter); #endif /* __HAL_INTF_H__ */ |