ath9k: use ah->get_mac_revision for all SoC devices if available

It is needed for AR934x as well

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 3aed729e4d5e6fd9d734d71f65a6fa6ad04b15e6..cf0128e6869e749f1bbf0e5998f12a62f52e39a4 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -222,31 +222,28 @@ static void ath9k_hw_read_revisions(struct ath_hw *ah)
 {
        u32 val;
 
+       if (ah->get_mac_revision)
+               ah->hw_version.macRev = ah->get_mac_revision();
+
        switch (ah->hw_version.devid) {
        case AR5416_AR9100_DEVID:
                ah->hw_version.macVersion = AR_SREV_VERSION_9100;
                break;
        case AR9300_DEVID_AR9330:
                ah->hw_version.macVersion = AR_SREV_VERSION_9330;
-               if (ah->get_mac_revision) {
-                       ah->hw_version.macRev = ah->get_mac_revision();
-               } else {
+               if (!ah->get_mac_revision) {
                        val = REG_READ(ah, AR_SREV);
                        ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                }
                return;
        case AR9300_DEVID_AR9340:
                ah->hw_version.macVersion = AR_SREV_VERSION_9340;
-               val = REG_READ(ah, AR_SREV);
-               ah->hw_version.macRev = MS(val, AR_SREV_REVISION2);
                return;
        case AR9300_DEVID_QCA955X:
                ah->hw_version.macVersion = AR_SREV_VERSION_9550;
                return;
        case AR9300_DEVID_AR953X:
                ah->hw_version.macVersion = AR_SREV_VERSION_9531;
-               if (ah->get_mac_revision)
-                       ah->hw_version.macRev = ah->get_mac_revision();
                return;
        }