Skip to contentSkip to conversation

staging: rtl8723bs: remove hal_btcoex_SetChipType()

PATCH In review Michael Straube 2 participants 2 messages Mar 24, 2023 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: remove hal_btcoex_SetChipType()

Remove the function hal_btcoex_SetChipType() as it does nothing and produces the following gcc warning when compiling with W=1.

drivers/staging/rtl8723bs/hal/hal_btcoex.c:1182:30: warning: variable 'pHalData' set but not used [-Wunused-but-set-variable]
1182 | struct hal_com_data *pHalData;
| ^~~~~~~~

---
 drivers/staging/rtl8723bs/hal/hal_btcoex.c        | 8 --------
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 -
 drivers/staging/rtl8723bs/include/hal_btcoex.h    | 1 -
 3 files changed, 10 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -8
index e36f8c369a04..e26b789b9cdd 100644
@@ -1177,14 +1177,6 @@ bool hal_btcoex_IsBtDisabled(struct adapter *padapter)
 		return false;
 }
 
-void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType)
-{
-	struct hal_com_data *pHalData;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-}
-
 void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum)
 {
 	struct hal_com_data *pHalData;
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
index 0fcae6871108..c3c1b49674d3 100644
@@ -2304,7 +2304,6 @@ void Hal_EfuseParseBTCoexistInfo_8723B(
 	}
 
 	hal_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist);
-	hal_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType);
 	hal_btcoex_SetPgAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1);
 	if (pHalData->EEPROMBluetoothAntNum == Ant_x1)
 		hal_btcoex_SetSingleAntPath(padapter, pHalData->ant_path);
drivers/staging/rtl8723bs/include/hal_btcoex.h +0 -1
index fb167642da01..525cce3574fe 100644
@@ -23,7 +23,6 @@ struct bt_coexist {
 void hal_btcoex_SetBTCoexist(struct adapter *padapter, u8 bBtExist);
 bool hal_btcoex_IsBtExist(struct adapter *padapter);
 bool hal_btcoex_IsBtDisabled(struct adapter *);
-void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType);
 void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum);
 void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath);
 
Signature · 1 line
2.40.0
Reviewed-by on v1 1/1
#1 lore raw

Hi,

Quoted 8 lines · Michael Straube

Remove the function hal_btcoex_SetChipType() as it does nothing and produces the following gcc warning when compiling with W=1.

drivers/staging/rtl8723bs/hal/hal_btcoex.c:1182:30: warning: variable 'pHalData' set but not used [-Wunused-but-set-variable]
1182 | struct hal_com_data *pHalData;
| ^~~~~~~~

Thanks, patch looks good to me:

Regards,

Hans

Quoted 49 lines
---
 drivers/staging/rtl8723bs/hal/hal_btcoex.c        | 8 --------
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 -
 drivers/staging/rtl8723bs/include/hal_btcoex.h    | 1 -
 3 files changed, 10 deletions(-)
drivers/staging/rtl8723bs/hal/hal_btcoex.c +0 -8
index e36f8c369a04..e26b789b9cdd 100644
@@ -1177,14 +1177,6 @@ bool hal_btcoex_IsBtDisabled(struct adapter *padapter)
 		return false;
 }
 
-void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType)
-{
-	struct hal_com_data *pHalData;
-
-
-	pHalData = GET_HAL_DATA(padapter);
-}
-
 void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum)
 {
 	struct hal_com_data *pHalData;
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -1
index 0fcae6871108..c3c1b49674d3 100644
@@ -2304,7 +2304,6 @@ void Hal_EfuseParseBTCoexistInfo_8723B(
 	}
 
 	hal_btcoex_SetBTCoexist(padapter, pHalData->EEPROMBluetoothCoexist);
-	hal_btcoex_SetChipType(padapter, pHalData->EEPROMBluetoothType);
 	hal_btcoex_SetPgAntNum(padapter, pHalData->EEPROMBluetoothAntNum == Ant_x2 ? 2 : 1);
 	if (pHalData->EEPROMBluetoothAntNum == Ant_x1)
 		hal_btcoex_SetSingleAntPath(padapter, pHalData->ant_path);
drivers/staging/rtl8723bs/include/hal_btcoex.h +0 -1
index fb167642da01..525cce3574fe 100644
@@ -23,7 +23,6 @@ struct bt_coexist {
 void hal_btcoex_SetBTCoexist(struct adapter *padapter, u8 bBtExist);
 bool hal_btcoex_IsBtExist(struct adapter *padapter);
 bool hal_btcoex_IsBtDisabled(struct adapter *);
-void hal_btcoex_SetChipType(struct adapter *padapter, u8 chipType);
 void hal_btcoex_SetPgAntNum(struct adapter *padapter, u8 antNum);
 void hal_btcoex_SetSingleAntPath(struct adapter *padapter, u8 singleAntPath);