staging: rtl8723au: Remove some CONFIG_8723AU_BT_COEXIST clutter

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_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index db97ffb989c1e3ff9f2dfc4a182a95d9adafab6e..e4caa3f8e701668424f692fdd5355683cf80e9a7 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -990,23 +990,21 @@ static void traffic_status_watchdog(struct rtw_adapter *padapter)
                                bHigherBusyTxTraffic = true;
                }
 
-#ifdef CONFIG_8723AU_BT_COEXIST
-               if (rtl8723a_BT_using_antenna_1(padapter) == false)
-#endif
-               {
+               if (!rtl8723a_BT_coexist(padapter) ||
+                   !rtl8723a_BT_using_antenna_1(padapter)) {
                /*  check traffic for  powersaving. */
-               if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod +
-                     pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) ||
-                   (pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2))
-                       bEnterPS = false;
-               else
-                       bEnterPS = true;
+                       if (((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod +
+                             pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8) ||
+                           pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod >2)
+                               bEnterPS = false;
+                       else
+                               bEnterPS = true;
 
-               /*  LeisurePS only work in infra mode. */
-               if (bEnterPS)
-                       LPS_Enter23a(padapter);
-               else
-                       LPS_Leave23a(padapter);
+                       /*  LeisurePS only work in infra mode. */
+                       if (bEnterPS)
+                               LPS_Enter23a(padapter);
+                       else
+                               LPS_Leave23a(padapter);
                }
        } else
                LPS_Leave23a(padapter);