diff options
| author | Jes Sorensen <Jes.Sorensen@redhat.com> | 2014-05-25 22:43:31 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-25 15:14:43 -0700 |
| commit | a862d5d307609be8ee7068a11626e571d4712e2b (patch) | |
| tree | b3d2756e6f5e1bb87287c9cf85f0bf515e91bff5 /drivers/staging/rtl8723au | |
| parent | f83e9e2a1359eea10caf04c3ea2dfd8d6f59d9df (diff) | |
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>
Diffstat (limited to 'drivers/staging/rtl8723au')
| -rw-r--r-- | drivers/staging/rtl8723au/core/rtw_cmd.c | 8 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c | 7 | ||||
| -rw-r--r-- | drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h | 2 |
3 files changed, 5 insertions, 12 deletions
diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index 0f837fa3820e..646b59b28551 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -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: diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c index f00313b9cc89..9891a2f70cb2 100644 --- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c +++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c @@ -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; diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h index 52e17329bc48..1b2845e67513 100644 --- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h +++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h @@ -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 |