staging: rtl8723au: Rename BT_WifiAssociateNotify() rtl8723a_BT_wifiassociate_notify()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index 30506073a56c48c8e89ce8c3aaa7772d699cd7c4..ed084d100e5c59d650f1e025de400053af64432d 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -145,7 +145,7 @@ void rtl8723a_BT_wifiscan_notify(struct rtw_adapter *padapter, u8 scanType)
        BTDM_WifiScanNotify(padapter, scanType);
 }
 
-void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action)
+void rtl8723a_BT_wifiassociate_notify(struct rtw_adapter *padapter, u8 action)
 {
        /*  action : */
        /*  true = associate start */

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index dc97885669a387431984eef6abbcc6ca4ec70bac..f13a21c53e3ba8a964ae2f5739d86d0b8beca5df 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -2558,20 +2558,18 @@ void hw_var_set_mlme_join(struct rtw_adapter *padapter, u8 type)
                          RetryLimit << RETRY_LIMIT_SHORT_SHIFT | RetryLimit <<
                          RETRY_LIMIT_LONG_SHIFT);
 
-#ifdef CONFIG_8723AU_BT_COEXIST
        switch (type) {
        case 0:
                /*  prepare to join */
-               BT_WifiAssociateNotify(padapter, true);
+               rtl8723a_BT_wifiassociate_notify(padapter, true);
                break;
        case 1:
                /*  joinbss_event callback when join res < 0 */
-               BT_WifiAssociateNotify(padapter, false);
+               rtl8723a_BT_wifiassociate_notify(padapter, false);
                break;
        case 2:
                /*  sta add event callback */
 /*             BT_WifiMediaStatusNotify(padapter, RT_MEDIA_CONNECT); */
                break;
        }
-#endif
 }

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index 8ab56d8b1e72b7ae2e7df27c00eb87637aa11eb6..eff40214b6d63aadc9cab6c54f7717ea9068e96a 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -31,8 +31,6 @@ enum rt_media_status {
 
 void BT_SignalCompensation(struct rtw_adapter *padapter,
                           u8 *rssi_wifi, u8 *rssi_bt);
-void BT_WifiAssociateNotify(struct rtw_adapter *padapter, u8 action);
-void BT_SpecialPacketNotify(struct rtw_adapter * padapter);
 void BT_HaltProcess(struct rtw_adapter * padapter);
 void BT_LpsLeave(struct rtw_adapter * padapter);
 

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index 98bea65a84785c2b0d990fcfac4ef2804e1244f1..ff9ad3f1d5106f8c10aad36b8ef5b049c33e1627 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -33,6 +33,7 @@ void rtl8723a_BT_disable_coexist(struct rtw_adapter *padapter);
 bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter);
 void rtl8723a_dual_antenna_detection(struct rtw_adapter *padapter);
 void rtl8723a_BT_init_hwconfig(struct rtw_adapter *padapter);
+void rtl8723a_BT_wifiassociate_notify(struct rtw_adapter *padapter, u8 action);
 #else
 static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
 {
@@ -58,6 +59,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
 }
 #define rtl8723a_dual_antenna_detection(padapter)              do {} while(0)
 #define rtl8723a_BT_init_hwconfig(padapter)                    do {} while(0)
+#define rtl8723a_BT_wifiassociate_notify(padapter, action)     do {} while(0)
 #endif
 
 #endif