From efa6b6c9c4c3d868db79753578a44da9742f6da1 Mon Sep 17 00:00:00 2001 From: Nishka Dasgupta Date: Mon, 1 Jul 2019 14:48:16 +0530 Subject: [PATCH] staging: rtl8723bs: Remove rtw_btcoex_SetChipType() Remove function rtw_btcoex_SetChipType as it does nothing but call hal_btcoex_SetChipType. Modify call site accordingly. Issue found with Coccinelle. Signed-off-by: Nishka Dasgupta Link: https://lore.kernel.org/r/20190701091817.12759-9-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 276aaab2781b..0d4367a0961a 100644 --- a/drivers/staging/rtl8723bs/core/rtw_btcoex.c +++ b/drivers/staging/rtl8723bs/core/rtw_btcoex.c @@ -57,11 +57,6 @@ s32 rtw_btcoex_IsBTCoexCtrlAMPDUSize(struct adapter *padapter) return coexctrl; } -void rtw_btcoex_SetChipType(struct adapter *padapter, u8 chipType) -{ - hal_btcoex_SetChipType(padapter, chipType); -} - void rtw_btcoex_SetPGAntNum(struct adapter *padapter, u8 antNum) { hal_btcoex_SetPgAntNum(padapter, antNum); diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c index 934245493c88..92e39ebf2dc6 100644 --- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c @@ -2695,7 +2695,7 @@ void Hal_EfuseParseBTCoexistInfo_8723B( } hal_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist); - rtw_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType); + hal_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType); rtw_btcoex_SetPGAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1); if (pHalData->EEPROMBluetoothAntNum == Ant_x1) rtw_btcoex_SetSingleAntPath(padapter, pHalData->ant_path); diff --git a/drivers/staging/rtl8723bs/include/rtw_btcoex.h b/drivers/staging/rtl8723bs/include/rtw_btcoex.h index 5b15e0129cc9..93aa4bc90c9e 100644 --- a/drivers/staging/rtl8723bs/include/rtw_btcoex.h +++ b/drivers/staging/rtl8723bs/include/rtw_btcoex.h @@ -20,7 +20,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_SetChipType(struct adapter *, u8 chipType); void rtw_btcoex_SetPGAntNum(struct adapter *, u8 antNum); void rtw_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath); u32 rtw_btcoex_GetRaMask(struct adapter *);