From aa0963a11669f0d10f8e263885e253d7ced4937a Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Tue, 2 Jul 2019 12:31:27 +0530 Subject: [PATCH] staging: rtl8723bs: Remove rtw_btcoex_BtInfoNotify() Remove function rtw_btcoex_BtInfoNotify as it does nothing except call hal_btcoex_BtInfoNotify. Modify call sites accordingly. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Link: https://lore.kernel.org/r/20190702070132.6997-4-nishkadg.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/core/rtw_cmd.c | 2 +- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 4 ++-- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - 4 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index cedc604..d9bae9f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -19,11 +19,6 @@ void rtw_btcoex_MediaStatusNotify(struct adapter *padapter, u8 mediaStatus) hal_btcoex_MediaStatusNotify(padapter, mediaStatus); } -void rtw_btcoex_BtInfoNotify(struct adapter *padapter, u8 length, u8 *tmpBuf) -{ - hal_btcoex_BtInfoNotify(padapter, length, tmpBuf); -} - void rtw_btcoex_HaltNotify(struct adapter *padapter) { if (!padapter->bup) { diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index 569a7fa..addc557 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -1829,7 +1829,7 @@ static void rtw_btinfo_hdl(struct adapter *adapter, u8 *buf, u16 buf_len) buf[1] = 0; else if (cmd_idx == BTINFO_BT_AUTO_RPT) buf[1] = 2; - rtw_btcoex_BtInfoNotify(adapter, len+1, &buf[1]); + hal_btcoex_BtInfoNotify(adapter, len+1, &buf[1]); } u8 rtw_c2h_packet_wk_cmd(struct adapter *padapter, u8 *pbuf, u16 length) diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index d055289..faeaf24 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -3693,7 +3693,7 @@ s32 c2h_handler_8723b(struct adapter *padapter, u8 *buf) break; case C2H_8723B_BT_INFO: - rtw_btcoex_BtInfoNotify(padapter, pC2hEvent->plen, pC2hEvent->payload); + hal_btcoex_BtInfoNotify(padapter, pC2hEvent->plen, pC2hEvent->payload); break; default: @@ -3742,7 +3742,7 @@ static void process_c2h_event(struct adapter *padapter, PC2H_EVT_HDR pC2hEvent, break; case C2H_8723B_BT_INFO: - rtw_btcoex_BtInfoNotify(padapter, pC2hEvent->CmdLen, c2hBuf); + hal_btcoex_BtInfoNotify(padapter, pC2hEvent->CmdLen, c2hBuf); break; default: diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 0d118e8..a1cab61 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -16,7 +16,6 @@ #define PACKET_EAPOL 3 void rtw_btcoex_MediaStatusNotify(struct adapter *, u8 mediaStatus); -void rtw_btcoex_BtInfoNotify(struct adapter *, u8 length, u8 *tmpBuf); void rtw_btcoex_HaltNotify(struct adapter *); s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *); void rtw_btcoex_DisplayBtCoexInfo(struct adapter *, u8 *pbuf, u32 bufsize); -- 2.7.4