staging: rtl8723au: Rename BTDM_FwC2hBtInfo8723A() to rtl8723a_fw_c2h_BT_info()

In addition get rid of some pointless code obfuscating wrappers

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 c1d54bcf5be70c7b1977b17d2b2335f829aa8b2d..c001053890903bd740e283a11917818300fd5eeb 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_bt-coexist.c
@@ -9396,8 +9396,8 @@ static void BTDM_FwC2hBtRssi8723A(struct rtw_adapter *padapter, u8 *tmpBuf)
 /*RTPRINT(FBT, BT_TRACE, ("[BTC2H], BT RSSI =%d\n", percent)); */
 }
 
-static void
-BTDM_FwC2hBtInfo8723A(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)
+void
+rtl8723a_fw_c2h_BT_info(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)
 {
        struct hal_data_8723a *pHalData;
        struct bt_30info *pBTInfo;
@@ -10131,11 +10131,6 @@ void BTDM_FwC2hBtRssi(struct rtw_adapter *padapter, u8 *tmpBuf)
        BTDM_FwC2hBtRssi8723A(padapter, tmpBuf);
 }
 
-void BTDM_FwC2hBtInfo(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length)
-{
-       BTDM_FwC2hBtInfo8723A(padapter, tmpBuf, length);
-}
-
 void BTDM_DisplayBtCoexInfo(struct rtw_adapter *padapter)
 {
        BTDM_Display8723ABtCoexInfo(padapter);

diff --git a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
index 7798532d3dfb2dd06290a4c87e0ec2425551cc60..487629c198fffd3e92818f55c8f53179765bc6ce 100644 (file)
--- a/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
+++ b/drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c
@@ -1202,12 +1202,11 @@ int c2h_handler_8723a(struct rtw_adapter *padapter, struct c2h_evt_hdr *c2h_evt)
                          c2h_evt->payload[3], c2h_evt->payload[4]));
                break;
 
-#ifdef CONFIG_8723AU_BT_COEXIST
        case C2H_BT_INFO:
                DBG_8723A("%s ,  Got  C2H_BT_INFO \n", __func__);
-               BT_FwC2hBtInfo(padapter, c2h_evt->payload, c2h_evt->plen);
+               rtl8723a_fw_c2h_BT_info(padapter,
+                                       c2h_evt->payload, c2h_evt->plen);
                break;
-#endif
 
        default:
                ret = _FAIL;

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
index 36376190cfdf708350341e65939f3f6e1f74059b..2a6a1005d6cfd0fbb181e1713dc8bf7e314f1982 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt-coexist.h
@@ -1543,8 +1543,6 @@ struct bt_coexist_str {
 void BTDM_CheckAntSelMode(struct rtw_adapter * padapter);
 void BTDM_FwC2hBtRssi(struct rtw_adapter * padapter, u8 *tmpBuf);
 #define BT_FwC2hBtRssi BTDM_FwC2hBtRssi
-void BTDM_FwC2hBtInfo(struct rtw_adapter * padapter, u8 *tmpBuf, u8 length);
-#define BT_FwC2hBtInfo BTDM_FwC2hBtInfo
 void BTDM_DisplayBtCoexInfo(struct rtw_adapter * padapter);
 #define BT_DisplayBtCoexInfo BTDM_DisplayBtCoexInfo
 void BTDM_RejectAPAggregatedPacket(struct rtw_adapter * padapter, u8 bReject);

diff --git a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
index fdcee75690278844223792c80f90776b3a7d0915..4733559970e59aad93d930e8f683e38247b2acd5 100644 (file)
--- a/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
+++ b/drivers/staging/rtl8723au/include/rtl8723a_bt_intf.h
@@ -35,6 +35,7 @@ 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);
 void rtl8723a_BT_init_hal_vars(struct rtw_adapter *padapter);
+void rtl8723a_fw_c2h_BT_info(struct rtw_adapter *padapter, u8 *tmpBuf, u8 length);
 #else
 static inline bool rtl8723a_BT_using_antenna_1(struct rtw_adapter *padapter)
 {
@@ -62,6 +63,7 @@ static inline bool rtl8723a_BT_disable_EDCA_turbo(struct rtw_adapter *padapter)
 #define rtl8723a_BT_init_hwconfig(padapter)                    do {} while(0)
 #define rtl8723a_BT_wifiassociate_notify(padapter, action)     do {} while(0)
 #define rtl8723a_BT_init_hal_vars(padapter)                    do {} while(0)
+#define rtl8723a_fw_c2h_BT_info(padapter, tmpBuf, length)      do {} while(0)
 #endif
 
 #endif