staging: r8188eu: remove ODM_GetRightChnlPlaceforIQK()
PATCH 1/1 staging: r8188eu: remove ODM_GetRightChnlPlaceforIQK()
Function ODM_GetRightChnlPlaceforIQK() returns always zero for channels <= 14. The driver is for chips that do not support 5 GHz, so remove the function and replace the usage of its return value with zero.
--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 29 ++------------------ 1 file changed, 3 insertions(+), 26 deletions(-)
drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +3 -26
@@ -1004,27 +1004,6 @@ static void phy_IQCalibrate_8188E(struct adapter *adapt, s32 result[][8], u8 t, } } -#define ODM_TARGET_CHNL_NUM_2G_5G 59 -static u8 ODM_GetRightChnlPlaceforIQK (u8 chnl) -{ -u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G ] = { -1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 , -36 ,38 ,40 ,42 ,44 ,46 ,48 ,50 ,52 ,54 ,56 ,58 ,60 ,62 ,64 , -100 ,102 ,104 ,106 ,108 ,110 ,112 ,114 ,116 ,118 ,120 ,122 , -124 ,126 ,128 ,130 ,132 ,134 ,136 ,138 ,140 ,149 ,151 ,153 , -155 ,157 ,159 ,161 ,163 ,165 - }; -u8 place = chnl; - -if (chnl >14 ) { -for (place =14 ; place <sizeof (channel_all); place++) { -if (channel_all[place] == chnl) -return place-13 ; - } - } -return 0 ; -} -static void phy_LCCalibrate_8188E (struct adapter *adapt,bool is2t) {u8 tmpreg;
@@ -1088,7 +1067,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)struct odm_dm_struct *dm_odm = &pHalData->odmpriv;struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx;s32 result[4 ][8 ];/* last is final result */ -u8 i, final_candidate, Indexforchannel; +u8 i, final_candidate;bool pathaok, pathbok;s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC, RegEC4;bool is12simular, is13simular, is23simular;
@@ -1200,14 +1179,12 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)pathb_fill_iqk (adapt, pathbok, result, final_candidate, (RegEC4 ==0 )); } - Indexforchannel =ODM_GetRightChnlPlaceforIQK (pHalData->CurrentChannel); -/* To Fix BSOD when final_candidate is 0xff */ /* by sherry 20120321 */ if (final_candidate <4 ) {for (i =0 ; i < IQK_Matrix_REG_NUM; i++) - dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0 ][i] = result[final_candidate][i]; - dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].bIQKDone = true; + dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[0 ].Value[0 ][i] = result[final_candidate][i]; + dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[0 ].bIQKDone = true; }_PHY_SaveADDARegisters (adapt,IQK_BB_REG_92C , dm_odm->RFCalibrateInfo.IQK_BB_backup_recover,9 );
Signature · 1 line
2.32.0
Quoted 6 lines · CEST Michael Straube
Function
ODM_GetRightChnlPlaceforIQK()returns always zero for channels <= 14. The driver is for chips that do not support 5 GHz, so remove the function and replace the usage of its return value with zero.Signed-off-by Michael Straube <[email protected]>
There appears to be some superfluous code left for the 5GHz band. Nice removal, so ...
Thanks,
Fabio
Quoted 70 lines · Michael Straube
Function
ODM_GetRightChnlPlaceforIQK()returns always zero for channels <= 14. The driver is for chips that do not support 5 GHz, so remove the function and replace the usage of its return value with zero.Signed-off-by Michael Straube <[email protected]>--- drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 29 ++------------------ 1 file changed, 3 insertions(+), 26 deletions(-)drivers/staging/r8188eu/hal/HalPhyRf_8188e.c +3
-27@@ -1004,27 +1004,6 @@ static void phy_IQCalibrate_8188E(struct adapter *adapt, s32 result[][8], u8 t, } } -#define ODM_TARGET_CHNL_NUM_2G_5G 59 -static u8 ODM_GetRightChnlPlaceforIQK (u8 chnl) -{ -u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G ] = { -1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 , -36 ,38 ,40 ,42 ,44 ,46 ,48 ,50 ,52 ,54 ,56 ,58 ,60 ,62 ,64 , -100 ,102 ,104 ,106 ,108 ,110 ,112 ,114 ,116 ,118 ,120 ,122 , -124 ,126 ,128 ,130 ,132 ,134 ,136 ,138 ,140 ,149 ,151 ,153 , -155 ,157 ,159 ,161 ,163 ,165 - }; -u8 place = chnl; - -if (chnl >14 ) { -for (place =14 ; place <sizeof (channel_all); place++) { -if (channel_all[place] == chnl) -return place-13 ; - } - } -return 0 ; -} -static void phy_LCCalibrate_8188E (struct adapter *adapt,bool is2t) {u8 tmpreg;@@ -1088,7 +1067,7 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)struct odm_dm_struct *dm_odm = &pHalData->odmpriv;struct mpt_context *pMptCtx = &adapt->mppriv.MptCtx;s32 result[4 ][8 ];/* last is final result */ -u8 i, final_candidate, Indexforchannel; +u8 i, final_candidate;bool pathaok, pathbok;s32 RegE94, RegE9C, RegEA4, RegEB4, RegEBC, RegEC4;bool is12simular, is13simular, is23simular;@@ -1200,14 +1179,12 @@ void PHY_IQCalibrate_8188E(struct adapter *adapt, bool recovery)pathb_fill_iqk (adapt, pathbok, result, final_candidate, (RegEC4 ==0 )); } - Indexforchannel =ODM_GetRightChnlPlaceforIQK (pHalData->CurrentChannel); -/* To Fix BSOD when final_candidate is 0xff */ /* by sherry 20120321 */ if (final_candidate <4 ) {for (i =0 ; i < IQK_Matrix_REG_NUM; i++) - dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].Value[0 ][i] = result[final_candidate][i]; - dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[Indexforchannel].bIQKDone = true; + dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[0 ].Value[0 ][i] = result[final_candidate][i]; + dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[0 ].bIQKDone = true; }_PHY_SaveADDARegisters (adapt,IQK_BB_REG_92C , dm_odm->RFCalibrateInfo.IQK_BB_backup_recover,9 ); --
Quoted 2 lines
2.32.0
Nice work, thanks.
Regards,
Phil