Staging: rtl8188eu: Remove redundant if conditions
PATCH v2 1/1 Staging: rtl8188eu: Remove redundant if conditions
Remove redundant if blocks as is2t is always false. Variable rf is always 1 as is2t is false. Variable value32 is unused after removing redundant code.
Signed-off-by Vatika Harlalka <[email protected]>
---
Changes in v2: Added one new unused if() block.
drivers/staging/rtl8188eu/hal/phy.c | 55 ++----------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +2 -53
@@ -464,14 +464,13 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)u8 thermal_val =0 , delta, delta_lck, delta_iqk, offset;u8 thermal_avg_count =0 ;u32 thermal_avg =0 ; -s32 ele_a =0 , ele_d, temp_cck, x, value32; +s32 ele_a =0 , ele_d, temp_cck, x;s32 y, ele_c =0 ;s8 ofdm_index[2 ], cck_index =0 ;s8 ofdm_index_old[2 ] = {0 ,0 }, cck_index_old =0 ;u32 i =0 , j =0 ; -bool is2t = false; -u8 ofdm_min_index =6 , rf;/* OFDM BB Swing should be less than +3.0dB */ +u8 ofdm_min_index =6 , rf =1 ;/* OFDM BB Swing should be less than +3.0dB */ u8 indexforchannel =0 ;s8 ofdm_index_mapping[2 ][index_mapping_NUM_88E] = {/* 2.4G, decrease power */
@@ -497,11 +496,6 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) thermal_val = (u8 )phy_query_rf_reg (adapt,RF_PATH_A ,RF_T_METER_88E ,0xfc00 ); -if (is2t) - rf =2 ; -else - rf =1 ; -if (thermal_val) {/* Query OFDM path A default setting */ ele_d =phy_query_bb_reg (adapt, rOFDM0_XATxIQImbalance, bMaskDWord)&bMaskOFDM_D;
@@ -513,17 +507,6 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) } } -/* Query OFDM path B default setting */ -if (is2t) { - ele_d =phy_query_bb_reg (adapt, rOFDM0_XBTxIQImbalance, bMaskDWord)&bMaskOFDM_D; -for (i =0 ; i <OFDM_TABLE_SIZE_92D ; i++) { -if (ele_d == (OFDMSwingTable[i]&bMaskOFDM_D)) { - ofdm_index_old[1 ] = (u8 )i; -break ; - } - } - } -/* Query CCK default setting From 0xa24 */ temp_cck = dm_odm->RFCalibrateInfo.RegA24;
@@ -666,40 +649,6 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) } -if (is2t) { - ele_d = (OFDMSwingTable[(u8 )ofdm_index[1 ]] &0xFFC00000 )>>22 ; - -/* new element A = element D x X */ - x = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[indexforchannel].Value[0 ][4 ]; - y = dm_odm->RFCalibrateInfo.IQKMatrixRegSetting[indexforchannel].Value[0 ][5 ]; - -if ((x !=0 ) && (*(dm_odm->pBandType) ==ODM_BAND_2_4G )) { -if ((x &0x00000200 ) !=0 )/* consider minus */ - x = x |0xFFFFFC00 ; - ele_a = ((x * ele_d)>>8 )&0x000003FF ; - -/* new element C = element D x Y */ -if ((y &0x00000200 ) !=0 ) - y = y |0xFFFFFC00 ; - ele_c = ((y * ele_d)>>8 )&0x00003FF ; - -/* wtite new elements A, C, D to regC88 and regC9C, element B is always 0 */ - value32 = (ele_d<<22 ) | ((ele_c&0x3F )<<16 ) | ele_a; -phy_set_bb_reg (adapt, rOFDM0_XBTxIQImbalance, bMaskDWord, value32); - - value32 = (ele_c&0x000003C0 )>>6 ; -phy_set_bb_reg (adapt, rOFDM0_XDTxAFE, bMaskH4Bits, value32); - - value32 = ((x * ele_d)>>7 )&0x01 ; -phy_set_bb_reg (adapt, rOFDM0_ECCAThreshold,BIT28 , value32); - }else { -phy_set_bb_reg (adapt, rOFDM0_XBTxIQImbalance, bMaskDWord, OFDMSwingTable[(u8 )ofdm_index[1 ]]); -phy_set_bb_reg (adapt, rOFDM0_XDTxAFE, bMaskH4Bits,0x00 ); -phy_set_bb_reg (adapt, rOFDM0_ECCAThreshold,BIT28 ,0x00 ); - } - - } - } }
Signature · 1 line
1.9.1
Greg KH
maintainerQuoted 10 lines · Vatika Harlalka
Remove redundant if blocks as is2t is always false. Variable rf is always 1 as is2t is false. Variable value32 is unused after removing redundant code.
Signed-off-by Vatika Harlalka <[email protected]>---
Changes in v2: Added one new unusedif()block.drivers/staging/rtl8188eu/hal/phy.c | 55 ++----------------------------------- 1 file changed, 2 insertions(+), 53 deletions(-)
Does not apply :(