Commit 11454dde authored by Deepak R Varma's avatar Deepak R Varma Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace underutilized struct by array variable 



For structure iqk_matrix_regs_setting, only the "Value" member variable
is utilized whereas the other struct members are only declared but not
utilised. Replace the struct declaration and implementation by an
equivalent variable similar to the only used struct member variable.
While in there, update the macro mixed case names to uppercase style.
The resultant code is simpler and is easy to maintain.

Suggested-by: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarDeepak R Varma <drv@mailo.com>
Link: https://lore.kernel.org/r/Y2ZF6O1KU3zZ6r3C@qemulion


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bb5b5e21

drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c

+10 −11
Original line number Diff line number Diff line
@@ -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.iqk_matrix_regs_setting_value[ChannelMappedIndex][0],

			pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][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.iqk_matrix_regs_setting_value[ChannelMappedIndex][0],

				pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][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.iqk_matrix_regs_setting_value[ChannelMappedIndex][0],

				pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][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.iqk_matrix_regs_setting_value[ChannelMappedIndex][0],

				pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[ChannelMappedIndex][1]);



			if (pDM_Odm->Modify_TxAGC_Flag_PathA) { /* If TxAGC has changed, reset TxAGC again */

				pDM_Odm->Remnant_OFDMSwingIdx[RFPath] = 0;
@@ -1759,9 +1759,8 @@ void PHY_IQCalibrate_8723B( 
/* To Fix BSOD when final_candidate is 0xff */

/* 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].bIQKDone = true;

		for (i = 0; i < IQK_MATRIX_REG_NUM; i++)

			pDM_Odm->RFCalibrateInfo.iqk_matrix_regs_setting_value[0][i] = result[final_candidate][i];

	}



	_PHY_SaveADDARegisters8723B(padapter, IQK_BB_REG_92C, pDM_Odm->RFCalibrateInfo.IQK_BB_backup_recover, 9);

drivers/staging/rtl8723bs/hal/odm.h

+3 −9
Original line number Diff line number Diff line
@@ -193,8 +193,8 @@ struct odm_rate_adaptive { 
#define HP_THERMAL_NUM		8



#define AVG_THERMAL_NUM		8

#define IQK_Matrix_REG_NUM	8

#define IQK_Matrix_Settings_NUM	14 /* Channels_2_4G_NUM */

#define IQK_MATRIX_REG_NUM	8

#define IQK_MATRIX_SETTINGS_NUM	14 /* Channels_2_4G_NUM */



#define		DM_Type_ByFW			0

#define		DM_Type_ByDriver		1
@@ -479,12 +479,6 @@ enum odm_type_alna_e { /* tag_ODM_TYPE_ALNA_Definition */ 
	TYPE_ALNA3 = BIT(3)|BIT(2)|BIT(1)|BIT(0)

};



struct iqk_matrix_regs_setting { /* _IQK_MATRIX_REGS_SETTING */

	bool bIQKDone;

	s32 Value[3][IQK_Matrix_REG_NUM];

	bool bBWIqkResultSaved[3];

};



/* Remove PATHDIV_PARA struct to odm_PathDiv.h */



struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */
@@ -530,7 +524,7 @@ struct odm_rf_cal_t { /* ODM_RF_Calibration_Structure */ 


	u8 ThermalValue_HP[HP_THERMAL_NUM];

	u8 ThermalValue_HP_index;

	struct iqk_matrix_regs_setting IQKMatrixRegSetting[IQK_Matrix_Settings_NUM];

	s32 iqk_matrix_regs_setting_value[IQK_MATRIX_SETTINGS_NUM][IQK_MATRIX_REG_NUM];

	bool bNeedIQK;

	bool bIQKInProgress;

	u8 Delta_IQK;