From: Jes Sorensen <Jes.Sorensen@redhat.com>
Date: Sun, 25 May 2014 20:43:33 +0000 (+0200)
Subject: staging: rtl8723au: rtw_pwrctrl.c: Remove an unnecessary COEXIST #ifdef
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=e631bae3636be516f7c9788136c351871bc23b36;p=deliverable%2Flinux.git

staging: rtl8723au: rtw_pwrctrl.c: Remove an unnecessary COEXIST #ifdef

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 f4e32d9efb8b..ef9b46879f11 100644
--- a/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
+++ b/drivers/staging/rtl8723au/core/rtw_pwrctrl.c
@@ -350,11 +350,8 @@ void rtw_set_ps_mode23a(struct rtw_adapter *padapter, u8 ps_mode,
 		rtl8723a_set_FwPwrMode_cmd(padapter, ps_mode);
 		pwrpriv->bFwCurrentInPSMode = false;
 	} else {
-		if (PS_RDY_CHECK(padapter)
-#ifdef CONFIG_8723AU_BT_COEXIST
-			|| (rtl8723a_BT_using_antenna_1(padapter))
-#endif
-			) {
+		if (PS_RDY_CHECK(padapter) ||
+		    rtl8723a_BT_using_antenna_1(padapter)) {
 			DBG_8723A("%s: Enter 802.11 power save\n", __func__);
 
 			pwrpriv->bFwCurrentInPSMode = true;