1 files changed, 30 insertions, 24 deletions

diff --git a/drivers/net/wireless/ath9k/reg.h b/drivers/net/wireless/ath9k/reg.h
index 45b9fbfb542a..17ed190349a5 100644
--- a/drivers/net/wireless/ath9k/reg.h
+++ b/drivers/net/wireless/ath9k/reg.h
@@ -160,7 +160,7 @@
 
 #define AR_SREV_VERSION_9100                  0x014
 
-#define AR_SREV_9100(ah) ((ah->ah_macVersion) == AR_SREV_VERSION_9100)
+#define AR_SREV_9100(ah) ((ah->hw_version.macVersion) == AR_SREV_VERSION_9100)
 #define AR_SREV_5416_V20_OR_LATER(_ah) \
         (AR_SREV_9100((_ah)) || AR_SREV_5416_20_OR_LATER(_ah))
 #define AR_SREV_5416_V22_OR_LATER(_ah) \
@@ -747,44 +747,50 @@
 #define AR_SREV_REVISION_9285_12              2
 
 #define AR_SREV_9100_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_5416_PCIE))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_5416_PCIE))
 #define AR_SREV_5416_20_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_9160) || \
-                ((_ah)->ah_macRev >= AR_SREV_REVISION_5416_20))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9160) || \
+                ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_20))
 #define AR_SREV_5416_22_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_9160) || \
-                ((_ah)->ah_macRev >= AR_SREV_REVISION_5416_22))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9160) || \
+                ((_ah)->hw_version.macRev >= AR_SREV_REVISION_5416_22))
 #define AR_SREV_9160(_ah) \
-        (((_ah)->ah_macVersion == AR_SREV_VERSION_9160))
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9160))
 #define AR_SREV_9160_10_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_9160))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9160))
 #define AR_SREV_9160_11(_ah) \
-        (AR_SREV_9160(_ah) && ((_ah)->ah_macRev == AR_SREV_REVISION_9160_11))
+        (AR_SREV_9160(_ah) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9160_11))
 #define AR_SREV_9280(_ah) \
-        (((_ah)->ah_macVersion == AR_SREV_VERSION_9280))
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9280))
 #define AR_SREV_9280_10_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_9280))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9280))
 #define AR_SREV_9280_20(_ah) \
-        (((_ah)->ah_macVersion == AR_SREV_VERSION_9280) && \
-                ((_ah)->ah_macRev >= AR_SREV_REVISION_9280_20))
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9280) && \
+                ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9280_20))
 #define AR_SREV_9280_20_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion > AR_SREV_VERSION_9280) || \
-        (((_ah)->ah_macVersion == AR_SREV_VERSION_9280) && \
-        ((_ah)->ah_macRev >= AR_SREV_REVISION_9280_20)))
+        (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9280) || \
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9280) && \
+        ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9280_20)))
 
-#define AR_SREV_9285(_ah) (((_ah)->ah_macVersion == AR_SREV_VERSION_9285))
+#define AR_SREV_9285(_ah) \
+        (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9285))
 #define AR_SREV_9285_10_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion >= AR_SREV_VERSION_9285))
+        (((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9285))
 #define AR_SREV_9285_11(_ah) \
-        (AR_SREV_9280(ah) && ((_ah)->ah_macRev == AR_SREV_REVISION_9285_11))
+        (AR_SREV_9280(ah) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9285_11))
 #define AR_SREV_9285_11_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion > AR_SREV_VERSION_9285) || \
-         (AR_SREV_9285(ah) && ((_ah)->ah_macRev >= AR_SREV_REVISION_9285_11)))
+        (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9285) || \
+         (AR_SREV_9285(ah) && ((_ah)->hw_version.macRev >= \
+                               AR_SREV_REVISION_9285_11)))
 #define AR_SREV_9285_12(_ah) \
-        (AR_SREV_9280(ah) && ((_ah)->ah_macRev == AR_SREV_REVISION_9285_12))
+        (AR_SREV_9280(ah) && \
+         ((_ah)->hw_version.macRev == AR_SREV_REVISION_9285_12))
 #define AR_SREV_9285_12_OR_LATER(_ah) \
-        (((_ah)->ah_macVersion > AR_SREV_VERSION_9285) || \
-         (AR_SREV_9285(ah) && ((_ah)->ah_macRev >= AR_SREV_REVISION_9285_12)))
+        (((_ah)->hw_version.macVersion > AR_SREV_VERSION_9285) || \
+         (AR_SREV_9285(ah) && ((_ah)->hw_version.macRev >= \
+                               AR_SREV_REVISION_9285_12)))
 
 #define AR_RADIO_SREV_MAJOR                   0xf0
 #define AR_RAD5133_SREV_MAJOR                 0xc0