From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Sun, 25 May 2014 20:43:44 +0000 (+0200)
Subject: staging: rtl8723au: Rename HALBT_InitBTVars8723A() rtl8723a_BT_init_hal_vars()
X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~198
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9b2d4aeaa83261dcb0eaad26700e9eaf973b7b1a;p=firefly-linux-kernel-4.4.55.git

staging: rtl8723au: Rename HALBT_InitBTVars8723A() rtl8723a_BT_init_hal_vars()

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/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index ed084d100e5c..5aa9ea5a22b9 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -11278,7 +11278,7 @@ void HALBT_RemoveKey(struct rtw_adapter *padapter, u8 EntryNum)
 	}
 }
 
-void HALBT_InitBTVars8723A(struct rtw_adapter *padapter)
+void rtl8723a_BT_init_hal_vars(struct rtw_adapter *padapter)
 {
 	struct hal_data_8723a *pHalData;
 
diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index fb364d1ba3a4..7798532d3dfb 100644
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1943,9 +1943,8 @@ Hal_EfuseParseBTCoexistInfo_8723A(struct rtw_adapter *padapter,
 		pHalData->EEPROMBluetoothAntIsolation = 0;
 		pHalData->EEPROMBluetoothRadioShared = BT_Radio_Shared;
 	}
-#ifdef CONFIG_8723AU_BT_COEXIST
-	BT_InitHalVars(padapter);
-#endif
+
+	rtl8723a_BT_init_hal_vars(padapter);
 }
 
 void
diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index eff40214b6d6..36376190cfdf 100644
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -1605,9 +1605,6 @@ u8 HALBT_GetPGAntNum(struct rtw_adapter * padapter);
 #define BT_GetPGAntNum HALBT_GetPGAntNum
 void HALBT_SetKey(struct rtw_adapter * padapter, u8 EntryNum);
 void HALBT_RemoveKey(struct rtw_adapter * padapter, u8 EntryNum);
-void HALBT_InitBTVars8723A(struct rtw_adapter * padapter);
-#define HALBT_InitHalVars HALBT_InitBTVars8723A
-#define BT_InitHalVars HALBT_InitHalVars
 u8 HALBT_IsBTExist(struct rtw_adapter * padapter);
 #define BT_IsBtExist HALBT_IsBTExist
 u8 HALBT_BTChipType(struct rtw_adapter * padapter);
diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index ff9ad3f1d510..fdcee7569027 100644
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -34,6 +34,7 @@ bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter);
 void rtl8723a_dual_antenna_detection(struct rtw_adapter *padapter);
 void rtl8723a_BT_init_hwconfig(struct rtw_adapter *padapter);
 void rtl8723a_BT_wifiassociate_notify(struct rtw_adapter *padapter, u8 action);
+void rtl8723a_BT_init_hal_vars(struct rtw_adapter *padapter);
 #else
 static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
 {
@@ -60,6 +61,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
 #define rtl8723a_dual_antenna_detection(padapter)		do {} while(0)
 #define rtl8723a_BT_init_hwconfig(padapter)			do {} while(0)
 #define rtl8723a_BT_wifiassociate_notify(padapter, action)	do {} while(0)
+#define rtl8723a_BT_init_hal_vars(padapter)			do {} while(0)
 #endif
 
 #endif