staging: rtl8723bs: refactor ODM_SetIQCbyRFpath to reduce duplication
PATCH v2 1/1 staging: rtl8723bs: refactor ODM_SetIQCbyRFpath to reduce duplication
Refactor ODM_SetIQCbyRFpath to remove duplicated PHY_SetBBReg() calls and improve readability.
The original implementation duplicated the same PHY_SetBBReg() calls for both RF paths (S0 / S1) with only the path index changing. This reduces code duplication,
makes the intent clearer and eases future maintenance.
No functional change intended: register keys/values and the selection logic remain the same.
Signed-off-by Bera Yüzlü <[email protected]>
---
V2: Removed helper function
V2: Used explicit if() instead of ?:
V2: Removed /* S1: RFpath = 0, S0:RFpath = 1 */ comment based on Dan Carpenter's suggestion
V1 link: https://lore.kernel.org/linux-staging/[email protected]/
.../staging/rtl8723bs/hal/HalPhyRf_8723B.c | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +13 -17
@@ -1078,6 +1078,7 @@ void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32 RFpath) {struct odm_rf_cal_t *pRFCalibrateInfo = &pDM_Odm->RFCalibrateInfo; +u8 path; if ( (pRFCalibrateInfo->TxIQC_8723B[PATH_S0][IDX_0xC80][VAL] != 0x0) &&
@@ -1085,23 +1086,18 @@ void ODM_SetIQCbyRFpath(struct dm_odm_t *pDM_Odm, u32 RFpath) (pRFCalibrateInfo->TxIQC_8723B[PATH_S1][IDX_0xC80][VAL] != 0x0) && (pRFCalibrateInfo->RxIQC_8723B[PATH_S1][IDX_0xC14][VAL] != 0x0) ) { -if (RFpath) {/* S1: RFpath = 0, S0:RFpath = 1 */ -/* S0 TX IQC */ -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC94][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC94][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC80][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC80][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC4C][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S0 ][IDX_0xC4C][VAL ]); -/* S0 RX IQC */ -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xC14][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xC14][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[PATH_S0 ][IDX_0xCA0][VAL ]); - }else { -/* S1 TX IQC */ -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC94][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC94][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC80][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC80][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC4C][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[PATH_S1 ][IDX_0xC4C][VAL ]); -/* S1 RX IQC */ -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xC14][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xC14][VAL ]); -PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[PATH_S1 ][IDX_0xCA0][VAL ]); - } +if (RFpath) + path =PATH_S0 ; +else + path =PATH_S1 ; + +/* TX IQC */ +PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC94][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC94][VAL ]); +PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC80][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC80][VAL ]); +PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC4C][KEY ], bMaskDWord, pRFCalibrateInfo->TxIQC_8723B[path][IDX_0xC4C][VAL ]); +/* RX IQC */ +PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xC14][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xC14][VAL ]); +PHY_SetBBReg (pDM_Odm->Adapter, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xCA0][KEY ], bMaskDWord, pRFCalibrateInfo->RxIQC_8723B[path][IDX_0xCA0][VAL ]); } }
Signature · 1 line
2.43.0