diff options
| author | Nishka Dasgupta <nishkadg.linux@gmail.com> | 2019-07-02 12:31:28 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-07-03 18:35:04 +0200 |
| commit | d312a47f35f71af0a3da9be7783d4c91b91fedce (patch) | |
| tree | 7404e2ab7f4156ae15ca43dbbc6f2ab0332b95a8 /drivers/staging | |
| parent | aa0963a11669f0d10f8e263885e253d7ced4937a (diff) | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_btcoex.c | 9 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 |
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index d9bae9fa78d6..e00336ab2ee6 100644 --- 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 69b479ea5872..4285844420cb 100644 --- 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 a1cab61fd5f0..904dda178f94 100644 --- 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); |