staging: rtl8723au: odm.c: Rename BTDM_DisableEDCATurbo() to rtl8723a_BT_disable_EDCA...

Make it return bool since it only returns true/false, and get rid of

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/odm.c b/drivers/staging/rtl8723au/hal/odm.c
index 6b3b2f0378a81e974591be1afead1b248573cab1..e15ebfe1881b6d623cb545bf5439626df5e3fb95 100644 (file)
--- a/drivers/staging/rtl8723au/hal/odm.c
+++ b/drivers/staging/rtl8723au/hal/odm.c
@@ -1668,10 +1668,8 @@ void odm_EdcaTurboCheck23aCE23a(struct dm_odm_t *pDM_Odm)
        if (pmlmeinfo->assoc_AP_vendor >=  HT_IOT_PEER_MAX)
                goto dm_CheckEdcaTurbo_EXIT;
 
-#ifdef CONFIG_8723AU_BT_COEXIST
-       if (BT_DisableEDCATurbo(Adapter))
+       if (rtl8723a_BT_disable_EDCA_turbo(Adapter))
                goto dm_CheckEdcaTurbo_EXIT;
-#endif
 
        /*  Check if the status needs to be changed. */
        if ((bbtchange) || (!precvpriv->bIsAnyNonBEPkts)) {

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
index b746b08db49738a1a527d9949d425313a486d010..4d94b4b99d60549dc5259aa7063cac6c9154291c 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -10534,13 +10534,13 @@ u8 BTDM_CheckCoexRSSIState(struct rtw_adapter *padapter, u8 levelNum,
        return btRssiState;
 }
 
-u8 BTDM_DisableEDCATurbo(struct rtw_adapter *padapter)
+bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
 {
        struct bt_mgnt *pBtMgnt;
        struct hal_data_8723a *pHalData;
        u8 bBtChangeEDCA = false;
        u32 EDCA_BT_BE = 0x5ea42b, cur_EDCA_reg;
-       u8 bRet = false;
+       bool bRet = false;
 
        pHalData = GET_HAL_DATA(padapter);
        pBtMgnt = &pHalData->BtInfo.BtMgnt;

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index 46e29045d2bca9b8ec8b3967282e9c2e7bb9790b..b5659fd9692d327d22e0b88372d66dda3d4b1f03 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -1557,8 +1557,6 @@ s32 BTDM_GetRxSS(struct rtw_adapter * padapter);
 u8 BTDM_CheckCoexBcnRssiState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
 u8 BTDM_CheckCoexRSSIState1(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
 u8 BTDM_CheckCoexRSSIState(struct rtw_adapter * padapter, u8 levelNum, u8 RssiThresh, u8 RssiThresh1);
-u8 BTDM_DisableEDCATurbo(struct rtw_adapter * padapter);
-#define BT_DisableEDCATurbo BTDM_DisableEDCATurbo
 void BTDM_Balance(struct rtw_adapter * padapter, u8 bBalanceOn, u8 ms0, u8 ms1);
 void BTDM_AGCTable(struct rtw_adapter * padapter, u8 type);
 void BTDM_BBBackOffLevel(struct rtw_adapter * padapter, u8 type);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index b63288909891ddbcea7d4a19e2dfbbe2b5cc11ec..5de42b0f97ad0a704ab8c809df450b6346e0cc19 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -30,6 +30,7 @@ void rtl8723a_BT_mediastatus_notify(struct rtw_adapter *padapter,
 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);
+bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter);
 #else
 static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
 {
@@ -49,6 +50,10 @@ static inline bool rtl8723a_BT_coexist(struct rtw_adapter *padapter)
 #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)
+static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
+{
+       return false;
+}
 #endif
 
 #endif