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

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
...@@ -1058,11 +1058,8 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type) ...@@ -1058,11 +1058,8 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
switch (lps_ctrl_type) switch (lps_ctrl_type)
{ {
case LPS_CTRL_SCAN: case LPS_CTRL_SCAN:
#ifdef CONFIG_8723AU_BT_COEXIST rtl8723a_BT_wifiscan_notify(padapter, true);
BT_WifiScanNotify(padapter, true); if (!rtl8723a_BT_using_antenna_1(padapter)) {
if (rtl8723a_BT_using_antenna_1(padapter) == false)
#endif
{
if (check_fwstate(pmlmepriv, _FW_LINKED)) if (check_fwstate(pmlmepriv, _FW_LINKED))
LPS_Leave23a(padapter); LPS_Leave23a(padapter);
} }
......
...@@ -581,9 +581,7 @@ void rtl8723a_mlme_sitesurvey(struct rtw_adapter *padapter, u8 flag) ...@@ -581,9 +581,7 @@ void rtl8723a_mlme_sitesurvey(struct rtw_adapter *padapter, u8 flag)
rtl8723au_write32(padapter, REG_RCR, v32); rtl8723au_write32(padapter, REG_RCR, v32);
} }
#ifdef CONFIG_8723AU_BT_COEXIST rtl8723a_BT_wifiscan_notify(padapter, flag ? true : false);
BT_WifiScanNotify(padapter, flag ? true : false);
#endif
} }
void rtl8723a_on_rcr_am(struct rtw_adapter *padapter) void rtl8723a_on_rcr_am(struct rtw_adapter *padapter)
......
...@@ -138,7 +138,7 @@ void BT_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rssi ...@@ -138,7 +138,7 @@ void BT_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rssi
BTDM_SignalCompensation(padapter, rssi_wifi, rssi_bt); 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); BTHCI_WifiScanNotify(padapter, scanType);
BTDM_CheckAntSelMode(padapter); BTDM_CheckAntSelMode(padapter);
......
...@@ -31,7 +31,6 @@ enum rt_media_status { ...@@ -31,7 +31,6 @@ enum rt_media_status {
void BT_SignalCompensation(struct rtw_adapter *padapter, void BT_SignalCompensation(struct rtw_adapter *padapter,
u8 *rssi_wifi, u8 *rssi_bt); 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_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action);
void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter, void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter,
enum rt_media_status mstatus); enum rt_media_status mstatus);
......
...@@ -23,6 +23,7 @@ bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter); ...@@ -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_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); void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter);
void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);
#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)
{ {
...@@ -37,6 +38,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter) ...@@ -37,6 +38,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
return false; return false;
} }
#define rtl8723a_BT_do_coexist(padapter) do {} while(0) #define rtl8723a_BT_do_coexist(padapter) do {} while(0)
#define rtl8723a_BT_wifiscan_notify(padapter, scanType) 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