shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-03 17:51:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: rtl8723au: Rename BT_WifiScanNotify() rtl8723a_BT_wifiscan_notify()

Browse Source 
Providing a dummy wrapper also allows removing some more
CONFIG_8723AU_BT_COEXIST clutter

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen
2014-05-25 22:43:28 +02:00
committed by Greg Kroah-Hartman
parent febf30876e
commit d952e4c4af
5 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/rtl8723au/core/rtw_cmd.c
View File

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

4
drivers/staging/rtl8723au/hal/hal_com.c
View File

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

2
drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
View File

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

1
drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
View File

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

2
drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
View File

@@ -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