Skip to contentSkip to conversation

Staging: rtl8188eu: Remove unnecessary if condition

PATCH New Vatika Harlalka 1 participant 1 message Feb 27, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: rtl8188eu: Remove unnecessary if condition

The variable final will never retain its original value of 0xff so the else branch can be eliminated.
The loop is eliminated as the reg values are reassigned.

---
 drivers/staging/rtl8188eu/hal/phy.c | 47 +++++++++++--------------------------
 1 file changed, 14 insertions(+), 33 deletions(-)
drivers/staging/rtl8188eu/hal/phy.c +14 -33
index d5b5998..b6b6b0b 100644
@@ -1418,40 +1418,21 @@ void rtl88eu_phy_iq_calibrate(struct adapter *adapt, bool recovery)
 		}
 	}
 
-	for (i = 0; i < 4; i++) {
-		reg_e94 = result[i][0];
-		reg_e9c = result[i][1];
-		reg_ea4 = result[i][2];
-		reg_eac = result[i][3];
-		reg_eb4 = result[i][4];
-		reg_ebc = result[i][5];
-		reg_ec4 = result[i][6];
-		reg_ecc = result[i][7];
-	}
+	reg_e94 = result[final][0];
+	reg_e9c = result[final][1];
+	reg_ea4 = result[final][2];
+	reg_eac = result[final][3];
+	reg_eb4 = result[final][4];
+	reg_ebc = result[final][5];
+	reg_ec4 = result[final][6];
+	reg_ecc = result[final][7];
+	dm_odm->RFCalibrateInfo.RegE94 = reg_e94;
+	dm_odm->RFCalibrateInfo.RegE9C = reg_e9c;
+	dm_odm->RFCalibrateInfo.RegEB4 = reg_eb4;
+	dm_odm->RFCalibrateInfo.RegEBC = reg_ebc;
+	pathaok = true;
+	pathbok = true;
 
-	if (final != 0xff) {
-		reg_e94 = result[final][0];
-		reg_e9c = result[final][1];
-		reg_ea4 = result[final][2];
-		reg_eac = result[final][3];
-		reg_eb4 = result[final][4];
-		reg_ebc = result[final][5];
-		dm_odm->RFCalibrateInfo.RegE94 = reg_e94;
-		dm_odm->RFCalibrateInfo.RegE9C = reg_e9c;
-		dm_odm->RFCalibrateInfo.RegEB4 = reg_eb4;
-		dm_odm->RFCalibrateInfo.RegEBC = reg_ebc;
-		reg_ec4 = result[final][6];
-		reg_ecc = result[final][7];
-		pathaok = true;
-		pathbok = true;
-	} else {
-		ODM_RT_TRACE(dm_odm, ODM_COMP_CALIBRATION, ODM_DBG_LOUD,
-			     ("IQK: FAIL use default value\n"));
-		dm_odm->RFCalibrateInfo.RegE94 = 0x100;
-		dm_odm->RFCalibrateInfo.RegEB4 = 0x100;
-		dm_odm->RFCalibrateInfo.RegE9C = 0x0;
-		dm_odm->RFCalibrateInfo.RegEBC = 0x0;
-	}
 	if (reg_e94 != 0)
 		patha_fill_iqk(adapt, pathaok, result, final,
 			       (reg_ea4 == 0));
Signature · 1 line
1.9.1