Commit 9b2d4aea authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Rename HALBT_InitBTVars8723A() rtl8723a_BT_init_hal_vars() 



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ec6d6871

drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+2 −3
Original line number Diff line number Diff line
@@ -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

drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h

+2 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE