staging: r8188eu: rename AntDivCompare8188E to rtw_hal_antdiv_rssi_compared
authorIvan Safonov <insafonov@gmail.com>
Sat, 3 Sep 2016 15:33:11 +0000 (22:33 +0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Sep 2016 09:30:03 +0000 (11:30 +0200)
And remove two one-line wrappers.

Signed-off-by: Ivan Safonov <insafonov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8188eu/hal/hal_intf.c
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
drivers/staging/rtl8188eu/include/hal_intf.h

index df1192e61ca9863a12a2001a5d532e8f241f6d04..c64e53fdaf2e74984566735bb9a304cd30fffa1b 100644 (file)
@@ -131,14 +131,6 @@ u8 rtw_hal_antdiv_before_linked(struct adapter *adapt)
        return false;
 }
 
-void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,
-                                 struct wlan_bssid_ex *dst,
-                                 struct wlan_bssid_ex *src)
-{
-       if (adapt->HalFunc.AntDivCompareHandler)
-               adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);
-}
-
 void rtw_hal_reset_security_engine(struct adapter *adapter)
 {
        if (adapter->HalFunc.hal_reset_security_engine)
index e717999118b9d198b9e40cf5bd67623bca75dc2d..1fa81e8a9d29912d565854a98523386a28eea2b7 100644 (file)
@@ -187,7 +187,7 @@ void rtl8188e_init_dm_priv(struct adapter *Adapter)
 
 /*  Add new function to reset the state of antenna diversity before link. */
 /*  Compare RSSI for deciding antenna */
-void AntDivCompare8188E(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
+void rtw_hal_antdiv_rssi_compared(struct adapter *Adapter, struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src)
 {
        struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
 
index c7b030f737e1311e70715f64c4c7c20655033474..7629c68c10d95a7bfbdfdcb53f55f933408d05d3 100644 (file)
@@ -201,7 +201,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;
 
        pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;
-       pHalFunc->AntDivCompareHandler = &AntDivCompare8188E;
 }
 
 /*  */
index 075cf03f43d5dfb86a55f5b3efddf8fb9c9105c5..c7b00bbffbe281563ab3378258e33585bc090174 100644 (file)
@@ -158,9 +158,6 @@ struct hal_ops {
                                u8 rssi_level);
 
        u8      (*AntDivBeforeLinkHandler)(struct adapter *adapter);
-       void    (*AntDivCompareHandler)(struct adapter *adapter,
-                                       struct wlan_bssid_ex *dst,
-                                       struct wlan_bssid_ex *src);
 
        void (*hal_reset_security_engine)(struct adapter *adapter);
 };