staging: r8188eu: remove UpdateRAMaskHandler member of hal_ops structure

It is unnecessary wrapper for UpdateHalRAMask8188EUsb function.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/hal/hal_intf.c b/drivers/staging/rtl8188eu/hal/hal_intf.c
index 514cbd1bcbed81d8dff9c7f59b107ec10e88d5c4..cff9b1bc8748c3e92d287c34ed2c9cc11cb1347a 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -198,9 +198,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/rtl8188eu/hal/usb_halinit.c b/drivers/staging/rtl8188eu/hal/usb_halinit.c
index d64940a5183929e791c66dcf13618ba04cff5b6d..841f691155b3a95e53a15f2d333562ced7544fca 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/usb_halinit.c
+++ b/drivers/staging/rtl8188eu/hal/usb_halinit.c
@@ -1933,7 +1933,7 @@ GetHalDefVar8188EUsb(
        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;
@@ -2084,7 +2084,5 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt)
        halfunc->GetHwRegHandler = &GetHwReg8188EU;
        halfunc->GetHalDefVarHandler = &GetHalDefVar8188EUsb;
 
-       halfunc->UpdateRAMaskHandler = &UpdateHalRAMask8188EUsb;
-
        rtl8188e_set_hal_ops(halfunc);
 }

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 188f58458c37f48278bd52a7f657d2d3306f24b8..c56f701e8fe14863ad6edea6c1f14e7d1b6de2ae 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -188,9 +188,6 @@ struct hal_ops {
                                       enum hal_odm_variable eVariable,
                                       void *pValue1, bool bSet);
 
-       void    (*UpdateRAMaskHandler)(struct adapter *padapter,
-                                      u32 mac_id, u8 rssi_level);
-
        void    (*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
                                u8 rssi_level);
 
@@ -230,6 +227,7 @@ enum hardware_type {
 
 #define is_boot_from_eeprom(adapter) (adapter->eeprompriv.EepromOrEfuse)
 
+void UpdateHalRAMask8188EUsb(struct adapter *adapt, u32 mac_id, u8 rssi_level);
 void rtw_hal_def_value_init(struct adapter *padapter);
 
 void   rtw_hal_free_data(struct adapter *padapter);