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

staging: rtl8723au: Rename BTDM_FwC2hBtInfo8723A() to rtl8723a_fw_c2h_BT_info() 



In addition get rid of some pointless code obfuscating wrappers

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

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

+2 −7
Original line number Diff line number Diff line
@@ -9396,8 +9396,8 @@ static void BTDM_FwC2hBtRssi8723A(struct rtw_adapter *padapter, u8 *tmpBuf) 
/*RTPRINT(FBT, BT_TRACE, ("[BTC2H], BT RSSI =%d\n", percent)); */

}



static void

BTDM_FwC2hBtInfo8723A(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)

void

rtl8723a_fw_c2h_BT_info(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)

{

	struct hal_data_8723a *pHalData;

	struct bt_30info *pBTInfo;
@@ -10131,11 +10131,6 @@ void BTDM_FwC2hBtRssi(struct rtw_adapter *padapter, u8 *tmpBuf) 
	BTDM_FwC2hBtRssi8723A(padapter, tmpBuf);

}



void BTDM_FwC2hBtInfo(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)

{

	BTDM_FwC2hBtInfo8723A(padapter, tmpBuf, length);

}



void BTDM_DisplayBtCoexInfo(struct rtw_adapter *padapter)

{

	BTDM_Display8723ABtCoexInfo(padapter);

drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c

+2 −3
Original line number Diff line number Diff line
@@ -1202,12 +1202,11 @@ int c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt) 
			  c2h_evt->payload[3], c2h_evt->payload[4]));

		break;



#ifdef CONFIG_8723AU_BT_COEXIST

	case C2H_BT_INFO:

		DBG_8723A("%s ,  Got  C2H_BT_INFO \n", __func__);

		BT_FwC2hBtInfo(padapter, c2h_evt->payload, c2h_evt->plen);

		rtl8723a_fw_c2h_BT_info(padapter,

					c2h_evt->payload, c2h_evt->plen);

		break;

#endif



	default:

		ret = _FAIL;

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

+0 −2
Original line number Diff line number Diff line
@@ -1543,8 +1543,6 @@ struct bt_coexist_str { 
void BTDM_CheckAntSelMode(struct rtw_adapter * padapter);

void BTDM_FwC2hBtRssi(struct rtw_adapter * padapter, u8 *tmpBuf);

#define BT_FwC2hBtRssi BTDM_FwC2hBtRssi

void BTDM_FwC2hBtInfo(struct rtw_adapter * padapter, u8 *tmpBuf, u8 length);

#define BT_FwC2hBtInfo BTDM_FwC2hBtInfo

void BTDM_DisplayBtCoexInfo(struct rtw_adapter * padapter);

#define BT_DisplayBtCoexInfo BTDM_DisplayBtCoexInfo

void BTDM_RejectAPAggregatedPacket(struct rtw_adapter * padapter, u8 bReject);

drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 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);

void rtl8723a_fw_c2h_BT_info(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length);

#else

static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)

{
@@ -62,6 +63,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter) 
#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)

#define rtl8723a_fw_c2h_BT_info(padapter, tmpBuf, length)	do {} while(0)

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE