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

staging: rtl8723au: odm.c: Rename BTDM_DisableEDCATurbo() to rtl8723a_BT_disable_EDCA_turbo() 



Make it return bool since it only returns true/false, and get rid of

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

drivers/staging/rtl8723au/hal/odm.c

+1 −3
Original line number Diff line number Diff line
@@ -1668,10 +1668,8 @@ void odm_EdcaTurboCheck23aCE23a(struct dm_odm_t *pDM_Odm) 
	if (pmlmeinfo->assoc_AP_vendor >=  HT_IOT_PEER_MAX)

		goto dm_CheckEdcaTurbo_EXIT;



#ifdef CONFIG_8723AU_BT_COEXIST

	if (BT_DisableEDCATurbo(Adapter))

	if (rtl8723a_BT_disable_EDCA_turbo(Adapter))

		goto dm_CheckEdcaTurbo_EXIT;

#endif



	/*  Check if the status needs to be changed. */

	if ((bbtchange) || (!precvpriv->bIsAnyNonBEPkts)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -10534,13 +10534,13 @@ u8 BTDM_CheckCoexRSSIState(struct rtw_adapter *padapter, u8 levelNum, 
	return btRssiState;

}



u8 BTDM_DisableEDCATurbo(struct rtw_adapter *padapter)

bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)

{

	struct bt_mgnt *pBtMgnt;

	struct hal_data_8723a *pHalData;

	u8 bBtChangeEDCA = false;

	u32 EDCA_BT_BE = 0x5ea42b, cur_EDCA_reg;

	u8 bRet = false;

	bool bRet = false;



	pHalData = GET_HAL_DATA(padapter);

	pBtMgnt = &pHalData->BtInfo.BtMgnt;

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

+0 −2
Original line number Diff line number Diff line
@@ -1557,8 +1557,6 @@ s32 BTDM_GetRxSS(struct rtw_adapter * padapter); 
u8 BTDM_CheckCoexBcnRssiState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);

u8 BTDM_CheckCoexRSSIState1(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);

u8 BTDM_CheckCoexRSSIState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);

u8 BTDM_DisableEDCATurbo(struct rtw_adapter * padapter);

#define BT_DisableEDCATurbo BTDM_DisableEDCATurbo

void BTDM_Balance(struct rtw_adapter * padapter, u8 bBalanceOn, u8 ms0, u8 ms1);

void BTDM_AGCTable(struct rtw_adapter * padapter, u8 type);

void BTDM_BBBackOffLevel(struct rtw_adapter * padapter, u8 type);

drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter, 
void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter);

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

#else

static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)

{
@@ -49,6 +50,10 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter) 
#define rtl8723a_BT_specialpacket_notify(padapter)		do {} while(0)

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

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

static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)

{

	return false;

}

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE