From 280e7a0bfab16cadeea48f212abcbab1b4a22a8e Mon Sep 17 00:00:00 2001
From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Sun, 25 May 2014 22:43:34 +0200
Subject: [PATCH] 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>
---
 drivers/staging/rtl8723au/core/rtw_pwrctrl.c         | 9 +++------
 drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c  | 2 +-
 drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h | 2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
index ef9b46879f11..dbd01b652e02 100644
--- 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 9891a2f70cb2..b746b08db497 100644
--- 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 1b2845e67513..b63288909891 100644
--- 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
-- 
2.39.5