staging: rtl8723au: Rename BT_WifiScanNotify() rtl8723a_BT_wifiscan_notify()

Providing a dummy wrapper also allows removing some more
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 986abd818e9235ed9c497270e69e59446fac5993..a4875aeda44699ff90fc12061ac41718f045c097 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -1058,11 +1058,8 @@ static void lps_ctrl_wk_hdl(struct rtw_adapter *padapter, u8 lps_ctrl_type)
        switch (lps_ctrl_type)
        {
                case LPS_CTRL_SCAN:
-#ifdef CONFIG_8723AU_BT_COEXIST
-                       BT_WifiScanNotify(padapter, true);
-                       if (rtl8723a_BT_using_antenna_1(padapter) == false)
-#endif
-                       {
+                       rtl8723a_BT_wifiscan_notify(padapter, true);
+                       if (!rtl8723a_BT_using_antenna_1(padapter)) {
                                if (check_fwstate(pmlmepriv, _FW_LINKED))
                                        LPS_Leave23a(padapter);
                        }

diff --git a/drivers/staging/rtl8723au/hal/hal_com.c b/drivers/staging/rtl8723au/hal/hal_com.c
index 09e888aaef716f4ab0a44cf20a5fd9ff3f7ad994..9fba049451528ac4952fc380c71ce0057aa47ff5 100644 (file)
--- a/drivers/staging/rtl8723au/hal/hal_com.c
+++ b/drivers/staging/rtl8723au/hal/hal_com.c
@@ -581,9 +581,7 @@ void rtl8723a_mlme_sitesurvey(struct rtw_adapter *padapter, u8 flag)
                rtl8723au_write32(padapter, REG_RCR, v32);
        }
 
-#ifdef CONFIG_8723AU_BT_COEXIST
-       BT_WifiScanNotify(padapter, flag ? true : false);
-#endif
+       rtl8723a_BT_wifiscan_notify(padapter, flag ? true : false);
 }
 
 void rtl8723a_on_rcr_am(struct rtw_adapter *padapter)

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index ab34b2bb45741ac9856148d5c859540bb3b7c3bb..5efdbfa6b69d3f7015816ea769beb23c57c019e8 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -138,7 +138,7 @@ void BT_SignalCompensation(struct rtw_adapter *padapter, u8 *rssi_wifi, u8 *rssi
        BTDM_SignalCompensation(padapter, rssi_wifi, rssi_bt);
 }
 
-void BT_WifiScanNotify(struct rtw_adapter *padapter, u8 scanType)
+void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType)
 {
        BTHCI_WifiScanNotify(padapter, scanType);
        BTDM_CheckAntSelMode(padapter);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index db25b72571137e3767f34e811055ff871554d562..aacbe397bdbff1526a7ca2216fb1e2ebc904b64e 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -31,7 +31,6 @@ enum rt_media_status {
 
 void BT_SignalCompensation(struct rtw_adapter *padapter,
                           u8 *rssi_wifi, u8 *rssi_bt);
-void BT_WifiScanNotify(struct rtw_adapter *padapter, u8 scanType);
 void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action);
 void BT_WifiMediaStatusNotify(struct rtw_adapter *padapter,
                              enum rt_media_status mstatus);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index 3e7bdde84b609c9dc3e9b0cc99844620d3f28d86..b198cf07359657bca38b7995accaade758171ed6 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -23,6 +23,7 @@ bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter);
 bool rtl8723a_BT_enabled(struct rtw_adapter *padapter);
 bool rtl8723a_BT_coexist(struct rtw_adapter *padapter);
 void rtl8723a_BT_do_coexist(struct rtw_adapter *padapter);
+void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType);
 #else
 static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
 {
@@ -37,6 +38,7 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
        return false;
 }
 #define rtl8723a_BT_do_coexist(padapter)       do {} while(0)
+#define rtl8723a_BT_wifiscan_notify(padapter, scanType)                do {} while(0)
 #endif
 
 #endif