staging: r8188eu: remove set_bwmode_handler from hal_ops

Remove set_bwmode_handler from hal_ops and remove its wrapper
rtw_hal_set_bwmode(). Call PHY_SetBWMode8188E() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-11-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_wlan_util.c b/drivers/staging/r8188eu/core/rtw_wlan_util.c
index ccb5fbbc3ffb6a09857dc2c71e1e7ab2d161df53..37400e29eec443b952d334a02f843db0cad8eeb5 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_wlan_util.c
+++ b/drivers/staging/r8188eu/core/rtw_wlan_util.c
@@ -328,7 +328,7 @@ void SetBWMode(struct adapter *padapter, unsigned short bwmode,
        rtw_set_oper_bw(padapter, bwmode);
        rtw_set_oper_choffset(padapter, channel_offset);
 
-       rtw_hal_set_bwmode(padapter, (enum ht_channel_width)bwmode, channel_offset);
+       PHY_SetBWMode8188E(padapter, (enum ht_channel_width)bwmode, channel_offset);
 }
 
 void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigned char channel_offset, unsigned short bwmode)

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 9374e5ecb13b12fb42a1df0f4e073d4e3683d5fd..93691e72e263f37cd2795db860e1f7e7880d9752 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -215,14 +215,6 @@ void rtw_hal_write_rfreg(struct adapter *adapt, enum rf_radio_path rfpath,
                                              bitmask, data);
 }
 
-void rtw_hal_set_bwmode(struct adapter *adapt,
-                       enum ht_channel_width bandwidth, u8 offset)
-{
-       if (adapt->HalFunc.set_bwmode_handler)
-               adapt->HalFunc.set_bwmode_handler(adapt, bandwidth,
-                                                    offset);
-}
-
 void rtw_hal_set_chan(struct adapter *adapt, u8 channel)
 {
        if (adapt->HalFunc.set_channel_handler)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 844a18117f09c7549438208cb799c248391ea875..8a73294d8bec4799ce8711756b04a1068705d5bc 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1784,7 +1784,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 {
        pHalFunc->free_hal_data = &rtl8188e_free_hal_data;
 
-       pHalFunc->set_bwmode_handler = &PHY_SetBWMode8188E;
        pHalFunc->set_channel_handler = &PHY_SwChnl8188E;
 
        pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index caf759a9eb486f0aa4a68a6cd6c3ecb946be76c7..f3f294aa6a245e973b0ee2471437a019d36deb8a 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -143,9 +143,6 @@ struct hal_ops {
        s32     (*init_recv_priv)(struct adapter *padapter);
        void    (*free_recv_priv)(struct adapter *padapter);
 
-       void    (*set_bwmode_handler)(struct adapter *padapter,
-                                     enum ht_channel_width Bandwidth,
-                                     u8 Offset);
        void    (*set_channel_handler)(struct adapter *padapter, u8 channel);
 
        void    (*SetHwRegHandler)(struct adapter *padapter, u8 variable,
@@ -284,8 +281,6 @@ void        rtw_hal_write_rfreg(struct adapter *padapter,
                            enum rf_radio_path eRFPath, u32 RegAddr,
                            u32 BitMask, u32 Data);
 
-void   rtw_hal_set_bwmode(struct adapter *padapter,
-                          enum ht_channel_width Bandwidth, u8 Offset);
 void   rtw_hal_set_chan(struct adapter *padapter, u8 channel);
 
 u8     rtw_hal_antdiv_before_linked(struct adapter *padapter);