Commit 00e8b24a authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723au: Rename HALBT_InitHwConfig() rtl8723a_BT_init_hwconfig() 



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

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

+1 −1
Original line number Diff line number Diff line
@@ -11330,7 +11330,7 @@ u8 HALBT_BTChipType(struct rtw_adapter *padapter) 
	return pHalData->bt_coexist.BT_CoexistType;

}



void HALBT_InitHwConfig(struct rtw_adapter *padapter)

void rtl8723a_BT_init_hwconfig(struct rtw_adapter *padapter)

{

	halbt_InitHwConfig8723A(padapter);

	rtl8723a_BT_do_coexist(padapter);

drivers/staging/rtl8723au/hal/usb_halinit.c

+2 −2
Original line number Diff line number Diff line
@@ -869,9 +869,9 @@ static int rtl8723au_hal_init(struct rtw_adapter *Adapter) 


#ifdef CONFIG_8723AU_BT_COEXIST

	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_BT_COEXIST);

	/*  Init BT hw config. */

	BT_InitHwConfig(Adapter);

#endif

	/*  Init BT hw config. */

	rtl8723a_BT_init_hwconfig(Adapter);



	HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_INIT_HAL_DM);

	rtl8723a_InitHalDm(Adapter);

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

+0 −2
Original line number Diff line number Diff line
@@ -1613,8 +1613,6 @@ void HALBT_InitBTVars8723A(struct rtw_adapter * padapter); 
u8 HALBT_IsBTExist(struct rtw_adapter * padapter);

#define BT_IsBtExist HALBT_IsBTExist

u8 HALBT_BTChipType(struct rtw_adapter * padapter);

void HALBT_InitHwConfig(struct rtw_adapter * padapter);

#define BT_InitHwConfig HALBT_InitHwConfig

void HALBT_SetRtsCtsNoLenLimit(struct rtw_adapter * padapter);



/*  ===== End of sync from SD7 driver HAL/HalBT.c ===== */

drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter); 
void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);

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);

#else

static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)

{
@@ -56,6 +57,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter) 
	return false;

}

#define rtl8723a_dual_antenna_detection(padapter)		do {} while(0)

#define rtl8723a_BT_init_hwconfig(padapter)			do {} while(0)

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE