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

staging: rtl8723au: rtw_pwrctrl.c: Eliminate CONFIG_8723AU_BT_COEXIST #ifdefs 

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:34 +02:00 committed by Greg Kroah-Hartman
parent e631bae363
commit 280e7a0bfa
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/rtl8723au/core/rtw_pwrctrl.c
View File

@ -20,9 +20,7 @@
#include <rtl8723a_cmd.h> #include <rtl8723a_cmd.h>
#include <rtw_sreset.h> #include <rtw_sreset.h>
#ifdef CONFIG_8723AU_BT_COEXIST #include <rtl8723a_bt_intf.h>
#include <rtl8723a_hal.h>
#endif
#include <usb_ops_linux.h> #include <usb_ops_linux.h>
void ips_enter23a(struct rtw_adapter * padapter) void ips_enter23a(struct rtw_adapter * padapter)
@ -38,9 +36,8 @@ void ips_enter23a(struct rtw_adapter * padapter)
pwrpriv->ips_enter23a_cnts++; pwrpriv->ips_enter23a_cnts++;
DBG_8723A("==>ips_enter23a cnts:%d\n", pwrpriv->ips_enter23a_cnts); DBG_8723A("==>ips_enter23a cnts:%d\n", pwrpriv->ips_enter23a_cnts);
#ifdef CONFIG_8723AU_BT_COEXIST rtl8723a_BT_disable_coexist(padapter);
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif
if (pwrpriv->change_rfpwrstate == rf_off) { if (pwrpriv->change_rfpwrstate == rf_off) {
pwrpriv->bpower_saving = true; pwrpriv->bpower_saving = true;
DBG_8723A_LEVEL(_drv_always_, "nolinked power save enter\n"); DBG_8723A_LEVEL(_drv_always_, "nolinked power save enter\n");

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

@ -10726,7 +10726,7 @@ void BTDM_CoexAllOff(struct rtw_adapter *padapter)
BTDM_HWCoexAllOff(padapter); BTDM_HWCoexAllOff(padapter);
} }
void BTDM_TurnOffBtCoexistBeforeEnterIPS(struct rtw_adapter *padapter) void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter)
{ {
struct pwrctrl_priv *ppwrctrl = &padapter->pwrctrlpriv; struct pwrctrl_priv *ppwrctrl = &padapter->pwrctrlpriv;

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

@ -29,6 +29,7 @@ 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); void rtl8723a_BT_lps_leave(struct rtw_adapter *padapter);
void rtl8723a_BT_disable_coexist(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)
{ {
@ -47,6 +48,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
#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) #define rtl8723a_BT_lps_leave(padapter) do {} while(0)
#define rtl8723a_BT_disable_coexist(padapter) do {} while(0)
#endif #endif
#endif #endif