Staging: rtl8188eu: Remove redundant if conditions
PATCH 1/1 Staging: rtl8188eu: Remove redundant if conditions
The if branches are redundant as is2t is declared false and is not modified before the if statements.
--- drivers/staging/rtl8188eu/hal/phy.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +2 -18
@@ -471,7 +471,8 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)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 ; +u8 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 */
@@ -496,12 +497,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 +508,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;
Signature · 1 line
1.9.1
Quoted 7 lines · Vatika Harlalka
The if branches are redundant as is2t is declared false and is not modified before the if statements.
Signed-off-by Vatika Harlalka <[email protected]>--- drivers/staging/rtl8188eu/hal/phy.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)
This one is perfect!
Jes
Quoted 46 lines
drivers/staging/rtl8188eu/hal/phy.c +2
-18@@ -471,7 +471,8 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)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 ; +u8 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 */ @@ -496,12 +497,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 +508,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;
Greg KH
maintainerQuoted 13 lines · Vatika Harlalka
The if branches are redundant as is2t is declared false and is not modified before the if statements.
Signed-off-by Vatika Harlalka <[email protected]>--- drivers/staging/rtl8188eu/hal/phy.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-)drivers/staging/rtl8188eu/hal/phy.c +0
-0
drivers/staging/rtl8188eu/hal/phy.c void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt) · line 472
Quoted 2 lines
drivers/staging/rtl8188eu/hal/phy.c +0
-0@@ -471,7 +471,8 @@ void rtl88eu_dm_txpower_tracking_callback_thermalmeter(struct adapter *adapt)u32 i =0 , j =0 ;bool is2t = false;
Can't you also just remove this variable? That way you will notice that you can get rid of one more chunk of if() in the function.
thanks,
greg k-h
Hey,
I noticed that other chunk of if() later and sent in another patch for it. I'll send in a v2 with both changes merged and remove the variable :)
Thanks!