staging: rtl8723bs: Remove function pointer set_chnl_bw_handler

Remove function pointer set_chnl_bw_handler and use
PHY_SetSwChnlBWMode8723B directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/fb4da3a1f3b3076641d7173a6b512abfbf60e7c5.1730749680.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index aaadd56b7d8a2620662716bf261cc7b5979530f0..7aa9d84ee574b87905d7eb34b7b0c93bd847c703 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -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)

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 615a33cad84a34977402937d207012cd58ad16a2..283208e1de5d1aa988bb014bf5337432fb1deab9 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -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;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 9e641431960889668020590d9d3351eb69b12eee..2b3eaabf077444d16eeb9396e69d49fba28306bb 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -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);