staging: rtl8723au: Pull update_ramask call out of HAL wrapper layer

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/hal_intf.c b/drivers/staging/rtl8723au/hal/hal_intf.c
index 86d934afeb5a336b14384fa1cba60006f7908cc3..75ddf5d5f8091ceaa77f89cf6439a3b31a0b24e4 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_intf.c
+++ b/drivers/staging/rtl8723au/hal/hal_intf.c
@@ -87,10 +87,8 @@ void rtw_hal_update_ra_mask23a(struct sta_info *psta, u8 rssi_level)
 #ifdef CONFIG_8723AU_AP_MODE
                add_RATid23a(padapter, psta, rssi_level);
 #endif
-       } else {
-               if (padapter->HalFunc.UpdateRAMaskHandler)
-                       padapter->HalFunc.UpdateRAMaskHandler(padapter, psta->mac_id, rssi_level);
-       }
+       } else
+               rtl8723a_update_ramask(padapter, psta->mac_id, rssi_level);
 }
 
 s32    rtw_hal_interrupt_handler23a(struct rtw_adapter *padapter)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 8e1eb81284a94b2681c6d307e7566624d5228e07..37b6b79fe220e2486bc83012c032252fba3041d3 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -4662,8 +4662,8 @@ bthci_StateConnected(struct rtw_adapter *padapter,
 
                /*  for rate adaptive */
 
-               if (padapter->HalFunc.UpdateRAMaskHandler)
-                       padapter->HalFunc.UpdateRAMaskHandler(padapter, MAX_FW_SUPPORT_MACID_NUM-1-EntryNum, 0);
+               rtl8723a_update_ramask(padapter,
+                                      MAX_FW_SUPPORT_MACID_NUM-1-EntryNum, 0);
 
                HalSetBrateCfg23a(padapter, padapter->mlmepriv.cur_network.network.SupportedRates);
                BTDM_SetFwChnlInfo(padapter, RT_MEDIA_CONNECT);

diff --git a/drivers/staging/rtl8723au/hal/usb_halinit.c b/drivers/staging/rtl8723au/hal/usb_halinit.c
index 60eed82445d766833a56699325b9a82e9be94ab7..db94b0c3d97380d38e7567071d0a96cc9ac25279 100644 (file)
--- a/drivers/staging/rtl8723au/hal/usb_halinit.c
+++ b/drivers/staging/rtl8723au/hal/usb_halinit.c
@@ -1612,8 +1612,8 @@ static u8 SetHalDefVar8192CUsb(struct rtw_adapter *Adapter,
        return bResult;
 }
 
-static void UpdateHalRAMask8192CUsb(struct rtw_adapter *padapter,
-                                   u32 mac_id, u8 rssi_level)
+void rtl8723a_update_ramask(struct rtw_adapter *padapter,
+                           u32 mac_id, u8 rssi_level)
 {
        u8      init_rate = 0;
        u8      networkType, raid;
@@ -1778,6 +1778,5 @@ int rtl8723au_set_hal_ops(struct rtw_adapter *padapter)
 
        pHalFunc->GetHalDefVarHandler = &GetHalDefVar8192CUsb;
        pHalFunc->SetHalDefVarHandler = &SetHalDefVar8192CUsb;
-       pHalFunc->UpdateRAMaskHandler = &UpdateHalRAMask8192CUsb;
        return 0;
 }

diff --git a/drivers/staging/rtl8723au/include/hal_intf.h b/drivers/staging/rtl8723au/include/hal_intf.h
index 8e44b88a3fc4b273c73cff795577f89a95bdf54f..56629f5dd57e3cbef73a42b844c29814656c11f4 100644 (file)
--- a/drivers/staging/rtl8723au/include/hal_intf.h
+++ b/drivers/staging/rtl8723au/include/hal_intf.h
@@ -76,9 +76,6 @@ struct hal_ops {
        u8 (*SetHalDefVarHandler)(struct rtw_adapter *padapter,
                                  enum hal_def_variable eVariable,
                                  void *pValue);
-
-       void (*UpdateRAMaskHandler)(struct rtw_adapter *padapter,
-                                   u32 mac_id, u8 rssi_level);
 };
 
 enum rt_eeprom_type {

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_hal.h b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
index dd9558460d7bd54ffe3c3d006b5c3de1c3d83415..efa78778ba230ed093fad722e5476fb0bf3fb90f 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_hal.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_hal.h
@@ -557,5 +557,7 @@ rtl8723a_readefuse(struct rtw_adapter *padapter,
                   u8 efuseType, u16 _offset, u16 _size_byte, u8 *pbuf);
 u16 rtl8723a_EfuseGetCurrentSize_WiFi(struct rtw_adapter *padapter);
 u16 rtl8723a_EfuseGetCurrentSize_BT(struct rtw_adapter *padapter);
+void rtl8723a_update_ramask(struct rtw_adapter *padapter,
+                           u32 mac_id, u8 rssi_level);
 
 #endif