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

staging: rtl8723au: Rename BT_WifiScanNotify() rtl8723a_BT_wifiscan_notify() 



Providing a dummy wrapper also allows removing some more
CONFIG_8723AU_BT_COEXIST clutter

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

drivers/staging/rtl8723au/core/rtw_cmd.c

+2 −5
Original line number Diff line number Diff line
@@ -1058,11 +1058,8 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type) 
	switch (lps_ctrl_type)

	{

		case LPS_CTRL_SCAN:

#ifdef CONFIG_8723AU_BT_COEXIST

			BT_WifiScanNotify(padapter, true);

			if (rtl8723a_BT_using_antenna_1(padapter) == false)

#endif

			{

			rtl8723a_BT_wifiscan_notify(padapter, true);

			if (!rtl8723a_BT_using_antenna_1(padapter)) {

				if (check_fwstate(pmlmepriv, _FW_LINKED))

					LPS_Leave23a(padapter);

			}

drivers/staging/rtl8723au/hal/hal_com.c

+1 −3
Original line number Diff line number Diff line
@@ -581,9 +581,7 @@ void rtl8723a_mlme_sitesurvey(struct rtw_adapter *padapter, u8 flag) 
		rtl8723au_write32(padapter, REG_RCR, v32);

	}



#ifdef CONFIG_8723AU_BT_COEXIST

	BT_WifiScanNotify(padapter, flag ? true : false);

#endif

	rtl8723a_BT_wifiscan_notify(padapter, flag ? true : false);

}



void rtl8723a_on_rcr_am(struct rtw_adapter *padapter)

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ void BT_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rssi 
	BTDM_SignalCompensation(padapter, rssi_wifi, rssi_bt);

}



void BT_WifiScanNotify(struct rtw_adapter *padapter, u8 scanType)

void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType)

{

	BTHCI_WifiScanNotify(padapter, scanType);

	BTDM_CheckAntSelMode(padapter);

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

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ enum rt_media_status { 


void BT_SignalCompensation(struct rtw_adapter *padapter,

			   u8 *rssi_wifi, u8 *rssi_bt);

void BT_WifiScanNotify(struct rtw_adapter *padapter, u8 scanType);

void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action);

void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter,

			      enum rt_media_status mstatus);

drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter); 
bool rtl8723a_BT_enabled(struct rtw_adapter *padapter);

bool rtl8723a_BT_coexist(struct rtw_adapter *padapter);

void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter);

void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);

#else

static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)

{
@@ -37,6 +38,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter) 
	return false;

}

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

#define rtl8723a_BT_wifiscan_notify(padapter, scanType)		do {} while(0)

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE