staging: rtl8723bs: Remove function pointer set_channel_handler

Remove function pointer set_channel_handler and use PHY_SwChnl8723B
directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/dbaabf4706ab222b5e43d37b405e9d374ed5f49a.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 397fd8fb3cb0f27871039afcd28ace74b77ff309..aaadd56b7d8a2620662716bf261cc7b5979530f0 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -274,8 +274,7 @@ void rtw_hal_write_rfreg(struct adapter *padapter, u32 eRFPath, u32 RegAddr, u32
 
 void 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,

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

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