Commit febf3087 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman

staging: rtl8723au: Rename BTDM_Coexist() to rtl8723a_BT_do_coexist()

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ef95e276
...@@ -1039,12 +1039,10 @@ static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz) ...@@ -1039,12 +1039,10 @@ static void dynamic_chk_wk_hdl(struct rtw_adapter *padapter, u8 *pbuf, int sz)
rtl8723a_HalDmWatchDog(padapter); rtl8723a_HalDmWatchDog(padapter);
#ifdef CONFIG_8723AU_BT_COEXIST
/* */ /* */
/* BT-Coexist */ /* BT-Coexist */
/* */ /* */
BT_CoexistMechanism(padapter); rtl8723a_BT_do_coexist(padapter);
#endif
} }
static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type) static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
......
...@@ -10766,7 +10766,7 @@ void BTDM_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rs ...@@ -10766,7 +10766,7 @@ void BTDM_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rs
BTDM_8723ASignalCompensation(padapter, rssi_wifi, rssi_bt); BTDM_8723ASignalCompensation(padapter, rssi_wifi, rssi_bt);
} }
void BTDM_Coexist(struct rtw_adapter *padapter) void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter)
{ {
struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter); struct hal_data_8723a *pHalData = GET_HAL_DATA(padapter);
...@@ -11347,7 +11347,7 @@ u8 HALBT_BTChipType(struct rtw_adapter *padapter) ...@@ -11347,7 +11347,7 @@ u8 HALBT_BTChipType(struct rtw_adapter *padapter)
void HALBT_InitHwConfig(struct rtw_adapter *padapter) void HALBT_InitHwConfig(struct rtw_adapter *padapter)
{ {
halbt_InitHwConfig8723A(padapter); halbt_InitHwConfig8723A(padapter);
BTDM_Coexist(padapter); rtl8723a_BT_do_coexist(padapter);
} }
void HALBT_SetRtsCtsNoLenLimit(struct rtw_adapter *padapter) void HALBT_SetRtsCtsNoLenLimit(struct rtw_adapter *padapter)
......
...@@ -1571,8 +1571,6 @@ void BTDM_HWCoexAllOff(struct rtw_adapter * padapter); ...@@ -1571,8 +1571,6 @@ void BTDM_HWCoexAllOff(struct rtw_adapter * padapter);
void BTDM_CoexAllOff(struct rtw_adapter * padapter); void BTDM_CoexAllOff(struct rtw_adapter * padapter);
void BTDM_TurnOffBtCoexistBeforeEnterIPS(struct rtw_adapter * padapter); void BTDM_TurnOffBtCoexistBeforeEnterIPS(struct rtw_adapter * padapter);
void BTDM_SignalCompensation(struct rtw_adapter * padapter, u8 *rssi_wifi, u8 *rssi_bt); void BTDM_SignalCompensation(struct rtw_adapter * padapter, u8 *rssi_wifi, u8 *rssi_bt);
void BTDM_Coexist(struct rtw_adapter * padapter);
#define BT_CoexistMechanism BTDM_Coexist
void BTDM_UpdateCoexState(struct rtw_adapter * padapter); void BTDM_UpdateCoexState(struct rtw_adapter * padapter);
u8 BTDM_IsSameCoexistState(struct rtw_adapter * padapter); u8 BTDM_IsSameCoexistState(struct rtw_adapter * padapter);
void BTDM_PWDBMonitor(struct rtw_adapter * padapter); void BTDM_PWDBMonitor(struct rtw_adapter * padapter);
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter); bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter);
bool rtl8723a_BT_enabled(struct rtw_adapter *padapter); bool rtl8723a_BT_enabled(struct rtw_adapter *padapter);
bool rtl8723a_BT_coexist(struct rtw_adapter *padapter); bool rtl8723a_BT_coexist(struct rtw_adapter *padapter);
void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter);
#else #else
static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter) static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
{ {
...@@ -35,6 +36,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter) ...@@ -35,6 +36,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
{ {
return false; return false;
} }
#define rtl8723a_BT_do_coexist(padapter) do {} while(0)
#endif #endif
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment