Skip to contentSkip to conversation

staging: r8188eu: rename AntDivBeforeLink8188E to rtw_hal_antdiv_before_linked

PATCH New Ivan Safonov 1 participant 1 message Sep 3, 2016 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 51/63 staging: r8188eu: rename AntDivBeforeLink8188E to rtw_hal_antdiv_before_linked

And remove two one-line wrappers.

---
 drivers/staging/rtl8188eu/hal/hal_intf.c          | 7 -------
 drivers/staging/rtl8188eu/hal/rtl8188e_dm.c       | 2 +-
 drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 2 --
 drivers/staging/rtl8188eu/include/hal_intf.h      | 2 --
 drivers/staging/rtl8188eu/include/rtl8188e_dm.h   | 1 -
 5 files changed, 1 insertion(+), 13 deletions(-)
drivers/staging/rtl8188eu/hal/hal_intf.c +0 -7
index c64e53f..bd5159c 100644
@@ -124,13 +124,6 @@ void rtw_hal_dm_watchdog(struct adapter *adapt)
 		adapt->HalFunc.hal_dm_watchdog(adapt);
 }
 
-u8 rtw_hal_antdiv_before_linked(struct adapter *adapt)
-{
-	if (adapt->HalFunc.AntDivBeforeLinkHandler)
-		return adapt->HalFunc.AntDivBeforeLinkHandler(adapt);
-	return false;
-}
-
 void rtw_hal_reset_security_engine(struct adapter *adapter)
 {
 	if (adapter->HalFunc.hal_reset_security_engine)
drivers/staging/rtl8188eu/hal/rtl8188e_dm.c +1 -1
index 1fa81e8..c4c8798 100644
@@ -201,7 +201,7 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *Adapter, struct wlan_bssid_ex
 }
 
 /*  Add new function to reset the state of antenna diversity before link. */
-u8 AntDivBeforeLink8188E(struct adapter *Adapter)
+u8 rtw_hal_antdiv_before_linked(struct adapter *Adapter)
 {
 	struct hal_data_8188e *hal_data = GET_HAL_DATA(Adapter);
 	struct odm_dm_struct *dm_odm = &hal_data->odmpriv;
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -2
index 7629c68..6facf4b 100644
@@ -199,8 +199,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
 	pHalFunc->hal_dm_watchdog = &rtl8188e_HalDmWatchDog;
 
 	pHalFunc->Add_RateATid = &rtl8188e_Add_RateATid;
-
-	pHalFunc->AntDivBeforeLinkHandler = &AntDivBeforeLink8188E;
 }
 
 /*  */
drivers/staging/rtl8188eu/include/hal_intf.h +0 -2
index c7b00bb..c79fa9c 100644
@@ -157,8 +157,6 @@ struct hal_ops {
 	void	(*Add_RateATid)(struct adapter *adapter, u32 bitmap, u8 arg,
 				u8 rssi_level);
 
-	u8	(*AntDivBeforeLinkHandler)(struct adapter *adapter);
-
 	void (*hal_reset_security_engine)(struct adapter *adapter);
 };
 
drivers/staging/rtl8188eu/include/rtl8188e_dm.h +0 -1
index 4190112..4ef657b 100644
@@ -51,6 +51,5 @@ void rtl8188e_HalDmWatchDog(struct adapter *adapt);
 
 void AntDivCompare8188E(struct adapter *adapt, struct wlan_bssid_ex *dst,
 			struct wlan_bssid_ex *src);
-u8 AntDivBeforeLink8188E(struct adapter *adapt);
 
 #endif
Signature · 1 line
2.7.3