From: Sujith <Sujith.Manoharan@atheros.com>
Date: Mon, 30 Mar 2009 09:58:24 +0000 (+0530)
Subject: ath9k: Remove redundant chainmask check
X-Git-Tag: firefly_0821_release~13604^2~645^2~155
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=6ed6a05e5c8061cdcd69a418c90c5f11979ce650;p=firefly-linux-kernel-4.4.55.git

ath9k: Remove redundant chainmask check

We get the valid chainmasks on HW attach, checking
it again during reset is redundant. This patch removes the check.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 13d8c2a4efae..22ef93f3d47c 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -2189,14 +2189,6 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
 	ah->txchainmask = sc->tx_chainmask;
 	ah->rxchainmask = sc->rx_chainmask;
 
-	if (AR_SREV_9285(ah)) {
-		ah->txchainmask &= 0x1;
-		ah->rxchainmask &= 0x1;
-	} else if (AR_SREV_9280(ah)) {
-		ah->txchainmask &= 0x3;
-		ah->rxchainmask &= 0x3;
-	}
-
 	if (!ath9k_hw_setpower(ah, ATH9K_PM_AWAKE))
 		return -EIO;