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>

diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
index ef9b46879f110d17a73dbe9c72579a2b742cb1c2..dbd01b652e0261f06f58b16aa29e3b5cdfafd75a 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
@@ -20,9 +20,7 @@
 #include <rtl8723a_cmd.h>
 #include <rtw_sreset.h>
 
-#ifdef CONFIG_8723AU_BT_COEXIST
-#include <rtl8723a_hal.h>
-#endif
+#include <rtl8723a_bt_intf.h>
 #include <usb_ops_linux.h>
 
 void ips_enter23a(struct rtw_adapter * padapter)
@@ -38,9 +36,8 @@ void ips_enter23a(struct rtw_adapter * padapter)
 
        pwrpriv->ips_enter23a_cnts++;
        DBG_8723A("==>ips_enter23a cnts:%d\n", pwrpriv->ips_enter23a_cnts);
-#ifdef CONFIG_8723AU_BT_COEXIST
-       BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
-#endif
+       rtl8723a_BT_disable_coexist(padapter);
+
        if (pwrpriv->change_rfpwrstate == rf_off) {
                pwrpriv->bpower_saving = true;
                DBG_8723A_LEVEL(_drv_always_, "nolinked power save enter\n");

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 9891a2f70cb2958eecf70b5e4b0b955c7f155b01..b746b08db49738a1a527d9949d425313a486d010 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -10726,7 +10726,7 @@ void BTDM_CoexAllOff(struct rtw_adapter *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;
 

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index 1b2845e67513fb984312a5ef406e2cb7373fa64f..b63288909891ddbcea7d4a19e2dfbbe2b5cc11ec 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -29,6 +29,7 @@ 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);
+void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);
 #else
 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_specialpacket_notify(padapter)             do {} while(0)
 #define rtl8723a_BT_lps_leave(padapter)                                do {} while(0)
+#define rtl8723a_BT_disable_coexist(padapter)                  do {} while(0)
 #endif
 
 #endif