Skip to contentSkip to conversation

ath9k_hw: simplify noisefloor calibration chainmask calculation

PATCH New Felix Fietkau 1 participant 1 message Jul 23, 2010 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore

Felix Fietkau

author
#0 lore raw

PATCH 1/1 ath9k_hw: simplify noisefloor calibration chainmask calculation

The noisefloor array index always corresponds to the rx chain number it belongs to (with an offset of 3 for the extension chain).

It's much simpler (and actually more correct) to directly use the chainmask to calculate the bitmask for the noisefloor array, instead of using these weird chip revision checks and hardcoded mask values.

Signed-off-by Felix Fietkau <[email protected]>

---

drivers/net/wireless/ath/ath9k/calib.c +1 -18
@@ -172,26 +172,9 @@ void ath9k_hw_loadnf(struct ath_hw *ah,
 	struct ath9k_nfcal_hist *h;
 	unsigned i, j;
 	int32_t val;
-	u8 chainmask;
+	u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
 	struct ath_common *common = ath9k_hw_common(ah);
 
-	if (AR_SREV_9300_20_OR_LATER(ah))
-		chainmask = 0x3F;
-	else if (AR_SREV_9285(ah) || AR_SREV_9271(ah))
-		chainmask = 0x9;
-	else if (AR_SREV_9280(ah) || AR_SREV_9287(ah)) {
-		if ((ah->rxchainmask & 0x2) || (ah->rxchainmask & 0x4))
-			chainmask = 0x1B;
-		else
-			chainmask = 0x09;
-	} else {
-		if (ah->rxchainmask & 0x4)
-			chainmask = 0x3F;
-		else if (ah->rxchainmask & 0x2)
-			chainmask = 0x1B;
-		else
-			chainmask = 0x09;
-	}
 	h = ah->nfCalHist;
 
 	for (i = 0; i < NUM_NF_READINGS; i++) {