Skip to contentSkip to conversation

staging: rtl8723bs: struct iqk_matrix_regs_setting cleanup

PATCH In review Deepak R Varma 2 participants 8 messages Nov 4, 2022 – Nov 8, 2022 Staging

lore
Share & tools
lore
#0 lore raw

cover staging: rtl8723bs: struct iqk_matrix_regs_setting cleanup

The patch set proposes code cleanup and simplification changes for struct iqk_matrix_regs_setting member variables. Resultant code is simpler and easier to maintain.

Deepak R Varma (2):
staging: rtl8723bs: Simplify underutilized 2D array to 1D array
staging: rtl8723bs: Remove unused member variable

 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +++++++++---------
 drivers/staging/rtl8723bs/hal/odm.h            |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

--
2.34.1

#1 lore raw

PATCH 1/2 staging: rtl8723bs: Simplify underutilized 2D array to 1D array

Member variable "Value" of structure iqk_matrix_regs_setting is declared to be a 2D array of [3][IQK_Matrix_REG_NUM] grid. However the primary index of this array is only used for index 0, the other two elements are never used. Simplify this array to a one dimension degree. The resultant code is simpler and is easy to maintain.

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +++++++++---------
 drivers/staging/rtl8723bs/hal/odm.h            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +9 -9
index a52748f7b56e..9317a4462c02 100644
@@ -244,8 +244,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			Final_CCK_Swing_Index = 0;
 
 		setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 		setCCKFilterCoefficient(pDM_Odm, Final_CCK_Swing_Index);
 
@@ -257,8 +257,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index - PwrTrackingLimit_OFDM;
 
 			setIqkMatrix_8723B(pDM_Odm, PwrTrackingLimit_OFDM, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
@@ -267,16 +267,16 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index;
 
 			setIqkMatrix_8723B(pDM_Odm, 0, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, HT_MCS0_MCS7);
 		} else {
 			setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			if (pDM_Odm->Modify_TxAGC_Flag_PathA) { /* If TxAGC has changed, reset TxAGC again */
 				pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = 0;
@@ -1760,7 +1760,7 @@ void PHY_IQCalibrate_8723B(
 /* by sherry 20120321 */
 	if (final_candidate < 4) {
 		for (i = 0; i < IQK_Matrix_REG_NUM; i++)
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[0][i] = result[final_candidate][i];
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[i] = result[final_candidate][i];
 		pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].bIQKDone = true;
 	}
 
drivers/staging/rtl8723bs/hal/odm.h +1 -1
index fe9782d2d4fd..e16a769850c5 100644
@@ -481,7 +481,7 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
-	s32 Value[3][IQK_Matrix_REG_NUM];
+	s32 Value[IQK_Matrix_REG_NUM];
 	bool bBWIqkResultSaved[3];
 };
 

--
2.34.1

#7 lore raw

PATCH 2/2 staging: rtl8723bs: Remove unused member variable

In reply to Deepak R Varma

Member variable bBWIqkResultSaved of struct iqk_matrix_regs_setting is declared but never used. Remove it.

---
 drivers/staging/rtl8723bs/hal/odm.h | 1 -
 1 file changed, 1 deletion(-)
drivers/staging/rtl8723bs/hal/odm.h +0 -1
index e16a769850c5..6891fa30c7f4 100644
@@ -482,7 +482,6 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
 	s32 Value[IQK_Matrix_REG_NUM];
-	bool bBWIqkResultSaved[3];
 };
 
 /* Remove PATHDIV_PARA struct to odm_PathDiv.h */

--
2.34.1

#2 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Simplify underutilized 2D array to 1D array

In reply to Deepak R Varma
Quoted 74 lines · Deepak R Varma

Member variable "Value" of structure iqk_matrix_regs_setting is declared to be a 2D array of [3][IQK_Matrix_REG_NUM] grid. However the primary index of this array is only used for index 0, the other two elements are never used. Simplify this array to a one dimension degree. The resultant code is simpler and is easy to maintain.

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +++++++++---------
 drivers/staging/rtl8723bs/hal/odm.h            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +9 -9
index a52748f7b56e..9317a4462c02 100644
@@ -244,8 +244,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			Final_CCK_Swing_Index = 0;
 
 		setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 		setCCKFilterCoefficient(pDM_Odm, Final_CCK_Swing_Index);
 
@@ -257,8 +257,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index - PwrTrackingLimit_OFDM;
 
 			setIqkMatrix_8723B(pDM_Odm, PwrTrackingLimit_OFDM, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
@@ -267,16 +267,16 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index;
 
 			setIqkMatrix_8723B(pDM_Odm, 0, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, HT_MCS0_MCS7);
 		} else {
 			setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			if (pDM_Odm->Modify_TxAGC_Flag_PathA) { /* If TxAGC has changed, reset TxAGC again */
 				pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = 0;
@@ -1760,7 +1760,7 @@ void PHY_IQCalibrate_8723B(
 /* by sherry 20120321 */
 	if (final_candidate < 4) {
 		for (i = 0; i < IQK_Matrix_REG_NUM; i++)
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[0][i] = result[final_candidate][i];
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[i] = result[final_candidate][i];
 		pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].bIQKDone = true;
 	}
 
drivers/staging/rtl8723bs/hal/odm.h +0 -0
index fe9782d2d4fd..e16a769850c5 100644

drivers/staging/rtl8723bs/hal/odm.h enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ · line 484

Quoted 5 lines
drivers/staging/rtl8723bs/hal/odm.h +1 -1
@@ -481,7 +481,7 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
-	s32 Value[3][IQK_Matrix_REG_NUM];
+	s32 Value[IQK_Matrix_REG_NUM];

This field is used to store values (as your above patch shows), but where is it actually used? Are you sure it is needed at all?

thanks,

greg k-h

#3 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Simplify underutilized 2D array to 1D array

Quoted 76 lines · Greg Kroah-Hartman
Quoted 75 lines · Deepak R Varma

Member variable "Value" of structure iqk_matrix_regs_setting is declared to be a 2D array of [3][IQK_Matrix_REG_NUM] grid. However the primary index of this array is only used for index 0, the other two elements are never used. Simplify this array to a one dimension degree. The resultant code is simpler and is easy to maintain.

---
 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 18 +++++++++---------
 drivers/staging/rtl8723bs/hal/odm.h            |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)
drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c +9 -9
index a52748f7b56e..9317a4462c02 100644
@@ -244,8 +244,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			Final_CCK_Swing_Index = 0;
 
 		setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 		setCCKFilterCoefficient(pDM_Odm, Final_CCK_Swing_Index);
 
@@ -257,8 +257,8 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index - PwrTrackingLimit_OFDM;
 
 			setIqkMatrix_8723B(pDM_Odm, PwrTrackingLimit_OFDM, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
@@ -267,16 +267,16 @@ void ODM_TxPwrTrackSetPwr_8723B(
 			pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = Final_OFDM_Swing_Index;
 
 			setIqkMatrix_8723B(pDM_Odm, 0, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			pDM_Odm->Modify_TxAGC_Flag_PathA = true;
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, OFDM);
 			PHY_SetTxPowerIndexByRateSection(Adapter, RFPath, pHalData->CurrentChannel, HT_MCS0_MCS7);
 		} else {
 			setIqkMatrix_8723B(pDM_Odm, Final_OFDM_Swing_Index, RFPath,
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][0],
-				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0][1]);
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[0],
+				pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[ChannelMappedIndex].Value[1]);
 
 			if (pDM_Odm->Modify_TxAGC_Flag_PathA) { /* If TxAGC has changed, reset TxAGC again */
 				pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = 0;
@@ -1760,7 +1760,7 @@ void PHY_IQCalibrate_8723B(
 /* by sherry 20120321 */
 	if (final_candidate < 4) {
 		for (i = 0; i < IQK_Matrix_REG_NUM; i++)
-			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[0][i] = result[final_candidate][i];
+			pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].Value[i] = result[final_candidate][i];
 		pDM_Odm->RFCalibrateInfo.IQKMatrixRegSetting[0].bIQKDone = true;
 	}
 
drivers/staging/rtl8723bs/hal/odm.h +0 -0
index fe9782d2d4fd..e16a769850c5 100644
@@ -481,7 +481,7 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 
Quoted 7 lines

drivers/staging/rtl8723bs/hal/odm.h enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ · line 484

Quoted 4 lines
drivers/staging/rtl8723bs/hal/odm.h +1 -1
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
-	s32 Value[3][IQK_Matrix_REG_NUM];
+	s32 Value[IQK_Matrix_REG_NUM];

This field is used to store values (as your above patch shows), but where is it actually used? Are you sure it is needed at all?

Hi Greg,
For this driver, the values are passed onto setIqkMatrix_8723B() as arguments and used inside this function. They are needed to be retained in the structure.

Thank you,
./drv

Quoted 5 lines

thanks,

greg k-h

#4 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Simplify underutilized 2D array to 1D array

Quoted 16 lines · Deepak R Varma
Quoted 7 lines · Greg Kroah-Hartman
Quoted 7 lines
drivers/staging/rtl8723bs/hal/odm.h +0 -0
index fe9782d2d4fd..e16a769850c5 100644
@@ -481,7 +481,7 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 
Quoted 7 lines

drivers/staging/rtl8723bs/hal/odm.h enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ · line 484

Quoted 4 lines
drivers/staging/rtl8723bs/hal/odm.h +1 -1
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
-	s32 Value[3][IQK_Matrix_REG_NUM];
+	s32 Value[IQK_Matrix_REG_NUM];

This field is used to store values (as your above patch shows), but where is it actually used? Are you sure it is needed at all?

Quoted 3 lines

Hi Greg,
For this driver, the values are passed onto setIqkMatrix_8723B() as arguments and used inside this function. They are needed to be retained in the structure.

Hello Greg,
Upon further review of the structure, I observed that the member "bIQKDone" is also not used anywhere in the code and it can be removed as well. That cleanup will lead to replacing this entire structure by a simple one dimensional 'Value" array.

Please suggest if I should make that change and send in a revision?

Thank you,
./drv

Quoted 13 lines

Thank you,
./drv

Quoted 5 lines

thanks,

greg k-h

#5 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Simplify underutilized 2D array to 1D array

Quoted 21 lines · Deepak R Varma
Quoted 16 lines · Deepak R Varma
Quoted 7 lines · Greg Kroah-Hartman
Quoted 7 lines
drivers/staging/rtl8723bs/hal/odm.h +0 -0
index fe9782d2d4fd..e16a769850c5 100644
@@ -481,7 +481,7 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */
 
Quoted 7 lines

drivers/staging/rtl8723bs/hal/odm.h enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ · line 484

Quoted 4 lines
drivers/staging/rtl8723bs/hal/odm.h +1 -1
 struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */
 	bool bIQKDone;
-	s32 Value[3][IQK_Matrix_REG_NUM];
+	s32 Value[IQK_Matrix_REG_NUM];

This field is used to store values (as your above patch shows), but where is it actually used? Are you sure it is needed at all?

Quoted 3 lines

Hi Greg,
For this driver, the values are passed onto setIqkMatrix_8723B() as arguments and used inside this function. They are needed to be retained in the structure.

Quoted 7 lines

Hello Greg,
Upon further review of the structure, I observed that the member "bIQKDone" is also not used anywhere in the code and it can be removed as well. That cleanup will lead to replacing this entire structure by a simple one dimensional 'Value" array.

Please suggest if I should make that change and send in a revision?

Yes, that would be a better overall change.

thanks,

greg k-h

#6 lore raw

Re: [PATCH 1/2] staging: rtl8723bs: Simplify underutilized 2D array to 1D array

Quoted 11 lines · Greg Kroah-Hartman
Quoted 8 lines · Deepak R Varma

On Sat, Nov 05, 2022 at 02:14:12PM +0530, Deepak R Varma wrote:
Hello Greg,
Upon further review of the structure, I observed that the member "bIQKDone" is also not used anywhere in the code and it can be removed as well. That cleanup will lead to replacing this entire structure by a simple one dimensional 'Value" array.

Please suggest if I should make that change and send in a revision?

Yes, that would be a better overall change.

Hello Greg,
The patch is resubmitted earlier with following subject:
[PATCH v2] staging: rtl8723bs: replace underutilized struct by array variable

Thank you,
./drv

Quoted 5 lines

thanks,

greg k-h