From 5355735196369c3aea955ce41eacd8fef7db4fda Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Mon, 1 Jul 2019 14:48:14 +0530 Subject: [PATCH] staging: rtl8723bs: Remove rtw_btcoex_SetBTCoexist() Remove function rtw_btcoex_SetBTCoexist as it does nothing except call hal_btcoex_SetBTCoexist. Modify call sites accordingly. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Link: https://lore.kernel.org/r/20190701091817.12759-7-nishkadg.linux@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_btcoex.c | 5 ----- drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- drivers/staging/rtl8723bs/include/rtw_btcoex.h | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_btcoex.c b/drivers/staging/rtl8723bs/core/rtw_btcoex.c index 734e938fbaf77..de8f6cae79429 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -62,11 +62,6 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter) return coexctrl; } -void rtw_btcoex_SetBTCoexist(struct adapter *padapter, u8 bBtExist) -{ - hal_btcoex_SetBTCoexist(padapter, bBtExist); -} - void rtw_btcoex_SetChipType(struct adapter *padapter, u8 chipType) { hal_btcoex_SetChipType(padapter, chipType); diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index b21f04faf9c71..5ce93a56ad68d 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -2694,7 +2694,7 @@ void Hal_EfuseParseBTCoexistInfo_8723B( } } - rtw_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist); + hal_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist); rtw_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType); rtw_btcoex_SetPGAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1); if (pHalData->EEPROMBluetoothAntNum == Ant_x1) diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 3b7f97f5b4c4f..d5552543a490d 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -21,7 +21,6 @@ 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_SetBTCoexist(struct adapter *, u8 bBtExist); void rtw_btcoex_SetChipType(struct adapter *, u8 chipType); void rtw_btcoex_SetPGAntNum(struct adapter *, u8 antNum); void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath); -- 2.30.2