staging: r8188eu: remove UpdateHalRAMask8188EUsb from hal_ops

Remove UpdateHalRAMask8188EUsb from hal_ops and call
UpdateHalRAMask8188EUsb() directly instead.

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

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index d38a813..92c55b9 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -139,9 +139,7 @@ void rtw_hal_update_ra_mask(struct adapter *adapt, u32 mac_id, u8 rssi_level)
                        add_RATid(adapt, psta, 0);/* todo: based on rssi_level*/
 #endif
        } else {
-               if (adapt->HalFunc.UpdateRAMaskHandler)
-                       adapt->HalFunc.UpdateRAMaskHandler(adapt, mac_id,
-                                                             rssi_level);
+               UpdateHalRAMask8188EUsb(adapt, mac_id, rssi_level);
        }
 }
 

diff --git a/drivers/staging/r8188eu/hal/usb_halinit.c b/drivers/staging/r8188eu/hal/usb_halinit.c
index 4d60b51..37a976c 100644 (file)
--- a/drivers/staging/r8188eu/hal/usb_halinit.c
+++ b/drivers/staging/r8188eu/hal/usb_halinit.c
@@ -2064,7 +2064,7 @@ static u8 SetHalDefVar8188EUsb(struct adapter *Adapter, enum hal_def_variable eV
        return bResult;
 }
 
-static void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)
+void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level)
 {
        u8 init_rate = 0;
        u8 networkType, raid;
@@ -2230,8 +2230,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
        halfunc->SetHalDefVarHandler = &SetHalDefVar8188EUsb;
 
-       halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;
-
        halfunc->hal_xmit = &rtl8188eu_hal_xmit;
        halfunc->mgnt_xmit = &rtl8188eu_mgnt_xmit;
 

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 668a21c..727ef85 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -147,9 +147,6 @@ struct hal_ops {
                                       enum hal_def_variable eVariable,
                                       void *pValue);
 
-       void    (*UpdateRAMaskHandler)(struct adapter *padapter,
-                                      u32 mac_id, u8 rssi_level);
-
        s32     (*hal_xmit)(struct adapter *padapter,
                            struct xmit_frame *pxmitframe);
        s32 (*mgnt_xmit)(struct adapter *padapter,
@@ -205,6 +202,7 @@ int rtl8188e_Efuse_PgPacketWrite(struct adapter *pAdapter, u8 offset, u8 word_en
 void hal_notch_filter_8188e(struct adapter *adapter, bool enable);
 
 void SetBeaconRelatedRegisters8188EUsb(struct adapter *adapt);
+void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);
 
 uint rtw_hal_init(struct adapter *padapter);
 uint rtw_hal_deinit(struct adapter *padapter);