staging: rtl8723bs: Remove rtw_btcoex_GetRaMask()

Remove function rtw_btcoex_GetRaMask as all it does is call
hal_btcoex_GetRaMask.
Modify call site accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190701091817.12759-10-nishkadg.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
index 0d4367a0961aaf6c29509f22e5f74c09e944b22e..915cd093a7598adbcfa09ba0660f982dd10b64f7 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -67,11 +67,6 @@ void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath)
        hal_btcoex_SetSingleAntPath(padapter, singleAntPath);
 }
 
-u32 rtw_btcoex_GetRaMask(struct adapter *padapter)
-{
-       return hal_btcoex_GetRaMask(padapter);
-}
-
 void rtw_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsize)
 {
        hal_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize);

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index 92e39ebf2dc60cacd561f38e27b2670777622b52..79929f957c60c2981ff4150d1801a2de8f8a52b5 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -2153,7 +2153,7 @@ static void UpdateHalRAMask8723B(struct adapter *padapter, u32 mac_id, u8 rssi_l
 
        mask &= rate_bitmap;
 
-       rate_bitmap = rtw_btcoex_GetRaMask(padapter);
+       rate_bitmap = hal_btcoex_GetRaMask(padapter);
        mask &= ~rate_bitmap;
 
 #ifdef CONFIG_CMCC_TEST

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index 93aa4bc90c9efdb36eab633e75d845f29177c665..9293a6705783d1edc71a82b360c3c922c05be03e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -22,7 +22,6 @@ void rtw_btcoex_HaltNotify(struct adapter *);
 s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *);
 void rtw_btcoex_SetPGAntNum(struct adapter *, u8 antNum);
 void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath);
-u32 rtw_btcoex_GetRaMask(struct adapter *);
 void rtw_btcoex_DisplayBtCoexInfo(struct adapter *, u8 *pbuf, u32 bufsize);
 void rtw_btcoex_SetDBG(struct adapter *, u32 *pDbgModule);
 u32 rtw_btcoex_GetDBG(struct adapter *, u8 *pStrBuf, u32 bufSize);