staging: r8188eu: rename AntDivCompare8188E to rtw_hal_antdiv_rssi_compared

And remove two one-line wrappers.

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 df1192e..c64e53f 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/hal_intf.c
+++ b/drivers/staging/rtl8188eu/hal/hal_intf.c
@@ -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)

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
index e717999..1fa81e8 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_dm.c
@@ -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);
 

diff --git a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
index c7b030f..7629c68 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c
@@ -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;
 }
 
 /*  */

diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
index 075cf03..c7b00bb 100644 (file)
--- a/drivers/staging/rtl8188eu/include/hal_intf.h
+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
@@ -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);
 };