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

staging: rtl8723au: Rename BT_LpsLeave() rtl8723a_BT_lps_leave()

Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f83e9e2a
...@@ -1088,13 +1088,9 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type) ...@@ -1088,13 +1088,9 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
LPS_Leave23a(padapter); LPS_Leave23a(padapter);
break; break;
case LPS_CTRL_LEAVE: case LPS_CTRL_LEAVE:
#ifdef CONFIG_8723AU_BT_COEXIST rtl8723a_BT_lps_leave(padapter);
BT_LpsLeave(padapter); if (!rtl8723a_BT_using_antenna_1(padapter))
if (rtl8723a_BT_using_antenna_1(padapter) == false)
#endif
{
LPS_Leave23a(padapter); LPS_Leave23a(padapter);
}
break; break;
default: default:
......
...@@ -161,11 +161,6 @@ void BT_HaltProcess(struct rtw_adapter *padapter) ...@@ -161,11 +161,6 @@ void BT_HaltProcess(struct rtw_adapter *padapter)
BTDM_ForHalt(padapter); BTDM_ForHalt(padapter);
} }
void BT_LpsLeave(struct rtw_adapter *padapter)
{
BTDM_LpsLeave(padapter);
}
/* ===== End of sync from SD7 driver COMMOM/BT.c ===== */ /* ===== End of sync from SD7 driver COMMOM/BT.c ===== */
#define i64fmt "ll" #define i64fmt "ll"
...@@ -9728,7 +9723,7 @@ BTDM_Set8723ABtCoexCurrAntNum(struct rtw_adapter *padapter, u8 antNum) ...@@ -9728,7 +9723,7 @@ BTDM_Set8723ABtCoexCurrAntNum(struct rtw_adapter *padapter, u8 antNum)
pBtCoex->TotalAntNum = Ant_x2; 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_30info *pBTInfo = GET_BT_INFO(padapter);
struct bt_mgnt *pBtMgnt = &pBTInfo->BtMgnt; struct bt_mgnt *pBtMgnt = &pBTInfo->BtMgnt;
......
...@@ -28,6 +28,7 @@ void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType); ...@@ -28,6 +28,7 @@ void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);
void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter, void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
enum rt_media_status mstatus); enum rt_media_status mstatus);
void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter); void rtl8723a_BT_specialpacket_notify(struct rtw_adapter *padapter);
void rtl8723a_BT_lps_leave(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)
{ {
...@@ -45,6 +46,7 @@ static inline bool rtl8723a_BT_coexist(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_wifiscan_notify(padapter, scanType) do {} while(0)
#define rtl8723a_BT_mediastatus_notify(padapter, mstatus) 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_specialpacket_notify(padapter) do {} while(0)
#define rtl8723a_BT_lps_leave(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