openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: rtl8723au: Rename BT_LpsLeave() rtl8723a_BT_lps_leave() 

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:31 +02:00 committed by Greg Kroah-Hartman
parent f83e9e2a13
commit a862d5d307
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1088,13 +1088,9 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
LPS_Leave23a(padapter);
break;
case LPS_CTRL_LEAVE:
#ifdef CONFIG_8723AU_BT_COEXIST
BT_LpsLeave(padapter);
if (rtl8723a_BT_using_antenna_1(padapter) == false)
#endif
{
rtl8723a_BT_lps_leave(padapter);
if (!rtl8723a_BT_using_antenna_1(padapter))
LPS_Leave23a(padapter);
}
break;
default:

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

@ -161,11 +161,6 @@ void BT_HaltProcess(struct rtw_adapter *padapter)
BTDM_ForHalt(padapter);
}
void BT_LpsLeave(struct rtw_adapter *padapter)
{
BTDM_LpsLeave(padapter);
}
/* ===== End of sync from SD7 driver COMMOM/BT.c ===== */
#define i64fmt "ll"
@ -9728,7 +9723,7 @@ BTDM_Set8723ABtCoexCurrAntNum(struct rtw_adapter *padapter, u8 antNum)
pBtCoex->TotalAntNum = Ant_x2;
}
void BTDM_LpsLeave(struct rtw_adapter *padapter)
void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter)
{
struct bt_30info *pBTInfo = GET_BT_INFO(padapter);
struct bt_mgnt *pBtMgnt = &pBTInfo->BtMgnt;

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

@ -28,6 +28,7 @@ void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);
void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
enum rt_media_status mstatus);
void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter);
void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter);
#else
static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
{
@ -45,6 +46,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
#define rtl8723a_BT_wifiscan_notify(padapter, scanType) do {} while(0)
#define rtl8723a_BT_mediastatus_notify(padapter, mstatus) do {} while(0)
#define rtl8723a_BT_specialpacket_notify(padapter) do {} while(0)
#define rtl8723a_BT_lps_leave(padapter) do {} while(0)
#endif
#endif