staging: rtl8723bs: Remove rtw_btcoex_IsBTCoexCtrlAMPDUSize()

Remove function rtw_btcoex_IsBTCoexCtrlAMPDUSize as it does nothing
except call hal_btcoex_IsBTCoexCtrlAMPDUSize.
Modify call site accordingly.
Issue found with Coccinelle.

Signed-off-by: Nishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190702070132.6997-5-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 d9bae9f..e00336a 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c
+++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c
@@ -38,15 +38,6 @@ void rtw_btcoex_HaltNotify(struct adapter *padapter)
        hal_btcoex_HaltNotify(padapter);
 }
 
-s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter)
-{
-       s32 coexctrl;
-
-       coexctrl = hal_btcoex_IsBTCoexCtrlAMPDUSize(padapter);
-
-       return coexctrl;
-}
-
 void rtw_btcoex_DisplayBtCoexInfo(struct adapter *padapter, u8 *pbuf, u32 bufsize)
 {
        hal_btcoex_DisplayBtCoexInfo(padapter, pbuf, bufsize);

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
index 69b479e..4285844 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme_ext.c
@@ -9,6 +9,7 @@
 #include <drv_types.h>
 #include <rtw_debug.h>
 #include <rtw_wifi_regd.h>
+#include <hal_btcoex.h>
 #include <linux/kernel.h>
 
 static struct mlme_handler mlme_sta_tbl[] = {
@@ -3944,7 +3945,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
                        } while (pmlmeinfo->dialogToken == 0);
                        pframe = rtw_set_fixed_ie(pframe, 1, &(pmlmeinfo->dialogToken), &(pattrib->pktlen));
 
-                       if (rtw_btcoex_IsBTCoexCtrlAMPDUSize(padapter)) {
+                       if (hal_btcoex_IsBTCoexCtrlAMPDUSize(padapter)) {
                                /*  A-MSDU NOT Supported */
                                BA_para_set = 0;
                                /*  immediate Block Ack */
@@ -4000,7 +4001,7 @@ void issue_action_BA(struct adapter *padapter, unsigned char *raddr, unsigned ch
                        else
                                BA_para_set = ((le16_to_cpu(pmlmeinfo->ADDBA_req.BA_para_set) & 0x3f) | 0x1000); /* 64 buffer size */
 
-                       if (rtw_btcoex_IsBTCoexCtrlAMPDUSize(padapter) &&
+                       if (hal_btcoex_IsBTCoexCtrlAMPDUSize(padapter) &&
                            padapter->driver_rx_ampdu_factor == 0xFF) {
                                /*  max buffer size is 8 MSDU */
                                BA_para_set &= ~RTW_IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK;

diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
index a1cab61..904dda1 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h
+++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h
@@ -17,7 +17,6 @@
 
 void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus);
 void rtw_btcoex_HaltNotify(struct adapter *);
-s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(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);