1 files changed, 127 insertions, 154 deletions

diff --git a/drivers/net/wireless/ath9k/ani.c b/drivers/net/wireless/ath9k/ani.c
index 251e2d9a7a4..d4df7e611df 100644
--- a/drivers/net/wireless/ath9k/ani.c
+++ b/drivers/net/wireless/ath9k/ani.c
@@ -14,23 +14,19 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "core.h"
-#include "hw.h"
-#include "reg.h"
-#include "phy.h"
+#include "ath9k.h"
 
-static int ath9k_hw_get_ani_channel_idx(struct ath_hal *ah,
+static int ath9k_hw_get_ani_channel_idx(struct ath_hw *ah,
                                         struct ath9k_channel *chan)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         int i;
 
-        for (i = 0; i < ARRAY_SIZE(ahp->ah_ani); i++) {
-                if (ahp->ah_ani[i].c.channel == chan->channel)
+        for (i = 0; i < ARRAY_SIZE(ah->ani); i++) {
+                if (ah->ani[i].c &&
+                    ah->ani[i].c->channel == chan->channel)
                         return i;
-                if (ahp->ah_ani[i].c.channel == 0) {
-                        ahp->ah_ani[i].c.channel = chan->channel;
-                        ahp->ah_ani[i].c.channelFlags = chan->channelFlags;
+                if (ah->ani[i].c == NULL) {
+                        ah->ani[i].c = chan;
                         return i;
                 }
         }
@@ -41,41 +37,40 @@ static int ath9k_hw_get_ani_channel_idx(struct ath_hal *ah,
         return 0;
 }
 
-static bool ath9k_hw_ani_control(struct ath_hal *ah,
+static bool ath9k_hw_ani_control(struct ath_hw *ah,
                                  enum ath9k_ani_cmd cmd, int param)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-        struct ar5416AniState *aniState = ahp->ah_curani;
+        struct ar5416AniState *aniState = ah->curani;
 
-        switch (cmd & ahp->ah_ani_function) {
+        switch (cmd & ah->ani_function) {
         case ATH9K_ANI_NOISE_IMMUNITY_LEVEL:{
                 u32 level = param;
 
-                if (level >= ARRAY_SIZE(ahp->ah_totalSizeDesired)) {
+                if (level >= ARRAY_SIZE(ah->totalSizeDesired)) {
                         DPRINTF(ah->ah_sc, ATH_DBG_ANI,
                                 "level out of range (%u > %u)\n",
                                 level,
-                                (unsigned)ARRAY_SIZE(ahp->ah_totalSizeDesired));
+                                (unsigned)ARRAY_SIZE(ah->totalSizeDesired));
                         return false;
                 }
 
                 REG_RMW_FIELD(ah, AR_PHY_DESIRED_SZ,
                               AR_PHY_DESIRED_SZ_TOT_DES,
-                              ahp->ah_totalSizeDesired[level]);
+                              ah->totalSizeDesired[level]);
                 REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
                               AR_PHY_AGC_CTL1_COARSE_LOW,
-                              ahp->ah_coarseLow[level]);
+                              ah->coarse_low[level]);
                 REG_RMW_FIELD(ah, AR_PHY_AGC_CTL1,
                               AR_PHY_AGC_CTL1_COARSE_HIGH,
-                              ahp->ah_coarseHigh[level]);
+                              ah->coarse_high[level]);
                 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
                               AR_PHY_FIND_SIG_FIRPWR,
-                              ahp->ah_firpwr[level]);
+                              ah->firpwr[level]);
 
                 if (level > aniState->noiseImmunityLevel)
-                        ahp->ah_stats.ast_ani_niup++;
+                        ah->stats.ast_ani_niup++;
                 else if (level < aniState->noiseImmunityLevel)
-                        ahp->ah_stats.ast_ani_nidown++;
+                        ah->stats.ast_ani_nidown++;
                 aniState->noiseImmunityLevel = level;
                 break;
         }
@@ -129,9 +124,9 @@ static bool ath9k_hw_ani_control(struct ath_hal *ah,
 
                 if (!on != aniState->ofdmWeakSigDetectOff) {
                         if (on)
-                                ahp->ah_stats.ast_ani_ofdmon++;
+                                ah->stats.ast_ani_ofdmon++;
                         else
-                                ahp->ah_stats.ast_ani_ofdmoff++;
+                                ah->stats.ast_ani_ofdmoff++;
                         aniState->ofdmWeakSigDetectOff = !on;
                 }
                 break;
@@ -145,9 +140,9 @@ static bool ath9k_hw_ani_control(struct ath_hal *ah,
                               weakSigThrCck[high]);
                 if (high != aniState->cckWeakSigThreshold) {
                         if (high)
-                                ahp->ah_stats.ast_ani_cckhigh++;
+                                ah->stats.ast_ani_cckhigh++;
                         else
-                                ahp->ah_stats.ast_ani_ccklow++;
+                                ah->stats.ast_ani_ccklow++;
                         aniState->cckWeakSigThreshold = high;
                 }
                 break;
@@ -167,9 +162,9 @@ static bool ath9k_hw_ani_control(struct ath_hal *ah,
                               AR_PHY_FIND_SIG_FIRSTEP,
                               firstep[level]);
                 if (level > aniState->firstepLevel)
-                        ahp->ah_stats.ast_ani_stepup++;
+                        ah->stats.ast_ani_stepup++;
                 else if (level < aniState->firstepLevel)
-                        ahp->ah_stats.ast_ani_stepdown++;
+                        ah->stats.ast_ani_stepdown++;
                 aniState->firstepLevel = level;
                 break;
         }
@@ -190,9 +185,9 @@ static bool ath9k_hw_ani_control(struct ath_hal *ah,
                               AR_PHY_TIMING5_CYCPWR_THR1,
                               cycpwrThr1[level]);
                 if (level > aniState->spurImmunityLevel)
-                        ahp->ah_stats.ast_ani_spurup++;
+                        ah->stats.ast_ani_spurup++;
                 else if (level < aniState->spurImmunityLevel)
-                        ahp->ah_stats.ast_ani_spurdown++;
+                        ah->stats.ast_ani_spurdown++;
                 aniState->spurImmunityLevel = level;
                 break;
         }
@@ -223,7 +218,7 @@ static bool ath9k_hw_ani_control(struct ath_hal *ah,
         return true;
 }
 
-static void ath9k_hw_update_mibstats(struct ath_hal *ah,
+static void ath9k_hw_update_mibstats(struct ath_hw *ah,
                                      struct ath9k_mib_stats *stats)
 {
         stats->ackrcv_bad += REG_READ(ah, AR_ACK_FAIL);
@@ -233,18 +228,17 @@ static void ath9k_hw_update_mibstats(struct ath_hal *ah,
         stats->beacons += REG_READ(ah, AR_BEACON_CNT);
 }
 
-static void ath9k_ani_restart(struct ath_hal *ah)
+static void ath9k_ani_restart(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416AniState *aniState;
 
         if (!DO_ANI(ah))
                 return;
 
-        aniState = ahp->ah_curani;
+        aniState = ah->curani;
 
         aniState->listenTime = 0;
-        if (ahp->ah_hasHwPhyCounters) {
+        if (ah->has_hw_phycounters) {
                 if (aniState->ofdmTrigHigh > AR_PHY_COUNTMAX) {
                         aniState->ofdmPhyErrBase = 0;
                         DPRINTF(ah->ah_sc, ATH_DBG_ANI,
@@ -270,24 +264,22 @@ static void ath9k_ani_restart(struct ath_hal *ah)
                 REG_WRITE(ah, AR_PHY_ERR_MASK_1, AR_PHY_ERR_OFDM_TIMING);
                 REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
 
-                ath9k_hw_update_mibstats(ah, &ahp->ah_mibStats);
+                ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
         }
         aniState->ofdmPhyErrCount = 0;
         aniState->cckPhyErrCount = 0;
 }
 
-static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah)
+static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-        struct ath9k_channel *chan = ah->ah_curchan;
+        struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
         struct ar5416AniState *aniState;
-        enum wireless_mode mode;
         int32_t rssi;
 
         if (!DO_ANI(ah))
                 return;
 
-        aniState = ahp->ah_curani;
+        aniState = ah->curani;
 
         if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
                 if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
@@ -303,14 +295,14 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah)
                 }
         }
 
-        if (ah->ah_opmode == NL80211_IFTYPE_AP) {
+        if (ah->opmode == NL80211_IFTYPE_AP) {
                 if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
                         ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
                                              aniState->firstepLevel + 1);
                 }
                 return;
         }
-        rssi = BEACON_RSSI(ahp);
+        rssi = BEACON_RSSI(ah);
         if (rssi > aniState->rssiThrHigh) {
                 if (!aniState->ofdmWeakSigDetectOff) {
                         if (ath9k_hw_ani_control(ah,
@@ -336,8 +328,7 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah)
                                              aniState->firstepLevel + 1);
                 return;
         } else {
-                mode = ath9k_hw_chan2wmode(ah, chan);
-                if (mode == ATH9K_MODE_11G || mode == ATH9K_MODE_11B) {
+                if (conf->channel->band == IEEE80211_BAND_2GHZ) {
                         if (!aniState->ofdmWeakSigDetectOff)
                                 ath9k_hw_ani_control(ah,
                                      ATH9K_ANI_OFDM_WEAK_SIGNAL_DETECTION,
@@ -350,39 +341,36 @@ static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hal *ah)
         }
 }
 
-static void ath9k_hw_ani_cck_err_trigger(struct ath_hal *ah)
+static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-        struct ath9k_channel *chan = ah->ah_curchan;
+        struct ieee80211_conf *conf = &ah->ah_sc->hw->conf;
         struct ar5416AniState *aniState;
-        enum wireless_mode mode;
         int32_t rssi;
 
         if (!DO_ANI(ah))
                 return;
 
-        aniState = ahp->ah_curani;
+        aniState = ah->curani;
         if (aniState->noiseImmunityLevel < HAL_NOISE_IMMUNE_MAX) {
                 if (ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL,
                                          aniState->noiseImmunityLevel + 1)) {
                         return;
                 }
         }
-        if (ah->ah_opmode == NL80211_IFTYPE_AP) {
+        if (ah->opmode == NL80211_IFTYPE_AP) {
                 if (aniState->firstepLevel < HAL_FIRST_STEP_MAX) {
                         ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
                                              aniState->firstepLevel + 1);
                 }
                 return;
         }
-        rssi = BEACON_RSSI(ahp);
+        rssi = BEACON_RSSI(ah);
         if (rssi > aniState->rssiThrLow) {
                 if (aniState->firstepLevel < HAL_FIRST_STEP_MAX)
                         ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
                                              aniState->firstepLevel + 1);
         } else {
-                mode = ath9k_hw_chan2wmode(ah, chan);
-                if (mode == ATH9K_MODE_11G || mode == ATH9K_MODE_11B) {
+                if (conf->channel->band == IEEE80211_BAND_2GHZ) {
                         if (aniState->firstepLevel > 0)
                                 ath9k_hw_ani_control(ah,
                                              ATH9K_ANI_FIRSTEP_LEVEL, 0);
@@ -390,22 +378,21 @@ static void ath9k_hw_ani_cck_err_trigger(struct ath_hal *ah)
         }
 }
 
-static void ath9k_hw_ani_lower_immunity(struct ath_hal *ah)
+static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416AniState *aniState;
         int32_t rssi;
 
-        aniState = ahp->ah_curani;
+        aniState = ah->curani;
 
-        if (ah->ah_opmode == NL80211_IFTYPE_AP) {
+        if (ah->opmode == NL80211_IFTYPE_AP) {
                 if (aniState->firstepLevel > 0) {
                         if (ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
                                                  aniState->firstepLevel - 1))
                                 return;
                 }
         } else {
-                rssi = BEACON_RSSI(ahp);
+                rssi = BEACON_RSSI(ah);
                 if (rssi > aniState->rssiThrHigh) {
                         /* XXX: Handle me */
                 } else if (rssi > aniState->rssiThrLow) {
@@ -444,9 +431,8 @@ static void ath9k_hw_ani_lower_immunity(struct ath_hal *ah)
         }
 }
 
-static int32_t ath9k_hw_ani_get_listen_time(struct ath_hal *ah)
+static int32_t ath9k_hw_ani_get_listen_time(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416AniState *aniState;
         u32 txFrameCount, rxFrameCount, cycleCount;
         int32_t listenTime;
@@ -455,11 +441,11 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hal *ah)
         rxFrameCount = REG_READ(ah, AR_RFCNT);
         cycleCount = REG_READ(ah, AR_CCCNT);
 
-        aniState = ahp->ah_curani;
+        aniState = ah->curani;
         if (aniState->cycleCount == 0 || aniState->cycleCount > cycleCount) {
 
                 listenTime = 0;
-                ahp->ah_stats.ast_ani_lzero++;
+                ah->stats.ast_ani_lzero++;
         } else {
                 int32_t ccdelta = cycleCount - aniState->cycleCount;
                 int32_t rfdelta = rxFrameCount - aniState->rxFrameCount;
@@ -473,25 +459,24 @@ static int32_t ath9k_hw_ani_get_listen_time(struct ath_hal *ah)
         return listenTime;
 }
 
-void ath9k_ani_reset(struct ath_hal *ah)
+void ath9k_ani_reset(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416AniState *aniState;
-        struct ath9k_channel *chan = ah->ah_curchan;
+        struct ath9k_channel *chan = ah->curchan;
         int index;
 
         if (!DO_ANI(ah))
                 return;
 
         index = ath9k_hw_get_ani_channel_idx(ah, chan);
-        aniState = &ahp->ah_ani[index];
-        ahp->ah_curani = aniState;
+        aniState = &ah->ani[index];
+        ah->curani = aniState;
 
-        if (DO_ANI(ah) && ah->ah_opmode != NL80211_IFTYPE_STATION
-            && ah->ah_opmode != NL80211_IFTYPE_ADHOC) {
+        if (DO_ANI(ah) && ah->opmode != NL80211_IFTYPE_STATION
+            && ah->opmode != NL80211_IFTYPE_ADHOC) {
                 DPRINTF(ah->ah_sc, ATH_DBG_ANI,
-                        "Reset ANI state opmode %u\n", ah->ah_opmode);
-                ahp->ah_stats.ast_ani_reset++;
+                        "Reset ANI state opmode %u\n", ah->opmode);
+                ah->stats.ast_ani_reset++;
 
                 ath9k_hw_ani_control(ah, ATH9K_ANI_NOISE_IMMUNITY_LEVEL, 0);
                 ath9k_hw_ani_control(ah, ATH9K_ANI_SPUR_IMMUNITY_LEVEL, 0);
@@ -504,15 +489,15 @@ void ath9k_ani_reset(struct ath_hal *ah)
                 ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) |
                                      ATH9K_RX_FILTER_PHYERR);
 
-                if (ah->ah_opmode == NL80211_IFTYPE_AP) {
-                        ahp->ah_curani->ofdmTrigHigh =
-                                ah->ah_config.ofdm_trig_high;
-                        ahp->ah_curani->ofdmTrigLow =
-                                ah->ah_config.ofdm_trig_low;
-                        ahp->ah_curani->cckTrigHigh =
-                                ah->ah_config.cck_trig_high;
-                        ahp->ah_curani->cckTrigLow =
-                                ah->ah_config.cck_trig_low;
+                if (ah->opmode == NL80211_IFTYPE_AP) {
+                        ah->curani->ofdmTrigHigh =
+                                ah->config.ofdm_trig_high;
+                        ah->curani->ofdmTrigLow =
+                                ah->config.ofdm_trig_low;
+                        ah->curani->cckTrigHigh =
+                                ah->config.cck_trig_high;
+                        ah->curani->cckTrigLow =
+                                ah->config.cck_trig_low;
                 }
                 ath9k_ani_restart(ah);
                 return;
@@ -533,7 +518,7 @@ void ath9k_ani_reset(struct ath_hal *ah)
         if (aniState->firstepLevel != 0)
                 ath9k_hw_ani_control(ah, ATH9K_ANI_FIRSTEP_LEVEL,
                                      aniState->firstepLevel);
-        if (ahp->ah_hasHwPhyCounters) {
+        if (ah->has_hw_phycounters) {
                 ath9k_hw_setrxfilter(ah, ath9k_hw_getrxfilter(ah) &
                                      ~ATH9K_RX_FILTER_PHYERR);
                 ath9k_ani_restart(ah);
@@ -547,31 +532,33 @@ void ath9k_ani_reset(struct ath_hal *ah)
         }
 }
 
-void ath9k_hw_ani_monitor(struct ath_hal *ah,
+void ath9k_hw_ani_monitor(struct ath_hw *ah,
                           const struct ath9k_node_stats *stats,
                           struct ath9k_channel *chan)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         struct ar5416AniState *aniState;
         int32_t listenTime;
 
-        aniState = ahp->ah_curani;
-        ahp->ah_stats.ast_nodestats = *stats;
+        if (!DO_ANI(ah))
+                return;
+
+        aniState = ah->curani;
+        ah->stats.ast_nodestats = *stats;
 
         listenTime = ath9k_hw_ani_get_listen_time(ah);
         if (listenTime < 0) {
-                ahp->ah_stats.ast_ani_lneg++;
+                ah->stats.ast_ani_lneg++;
                 ath9k_ani_restart(ah);
                 return;
         }
 
         aniState->listenTime += listenTime;
 
-        if (ahp->ah_hasHwPhyCounters) {
+        if (ah->has_hw_phycounters) {
                 u32 phyCnt1, phyCnt2;
                 u32 ofdmPhyErrCnt, cckPhyErrCnt;
 
-                ath9k_hw_update_mibstats(ah, &ahp->ah_mibStats);
+                ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
                 phyCnt1 = REG_READ(ah, AR_PHY_ERR_1);
                 phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
@@ -604,27 +591,24 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah,
                 }
 
                 ofdmPhyErrCnt = phyCnt1 - aniState->ofdmPhyErrBase;
-                ahp->ah_stats.ast_ani_ofdmerrs +=
+                ah->stats.ast_ani_ofdmerrs +=
                         ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
                 aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
 
                 cckPhyErrCnt = phyCnt2 - aniState->cckPhyErrBase;
-                ahp->ah_stats.ast_ani_cckerrs +=
+                ah->stats.ast_ani_cckerrs +=
                         cckPhyErrCnt - aniState->cckPhyErrCount;
                 aniState->cckPhyErrCount = cckPhyErrCnt;
         }
 
-        if (!DO_ANI(ah))
-                return;
-
-        if (aniState->listenTime > 5 * ahp->ah_aniPeriod) {
+        if (aniState->listenTime > 5 * ah->aniperiod) {
                 if (aniState->ofdmPhyErrCount <= aniState->listenTime *
                     aniState->ofdmTrigLow / 1000 &&
                     aniState->cckPhyErrCount <= aniState->listenTime *
                     aniState->cckTrigLow / 1000)
                         ath9k_hw_ani_lower_immunity(ah);
                 ath9k_ani_restart(ah);
-        } else if (aniState->listenTime > ahp->ah_aniPeriod) {
+        } else if (aniState->listenTime > ah->aniperiod) {
                 if (aniState->ofdmPhyErrCount > aniState->listenTime *
                     aniState->ofdmTrigHigh / 1000) {
                         ath9k_hw_ani_ofdm_err_trigger(ah);
@@ -638,20 +622,16 @@ void ath9k_hw_ani_monitor(struct ath_hal *ah,
         }
 }
 
-bool ath9k_hw_phycounters(struct ath_hal *ah)
+bool ath9k_hw_phycounters(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
-        return ahp->ah_hasHwPhyCounters ? true : false;
+        return ah->has_hw_phycounters ? true : false;
 }
 
-void ath9k_enable_mib_counters(struct ath_hal *ah)
+void ath9k_enable_mib_counters(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
         DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Enable MIB counters\n");
 
-        ath9k_hw_update_mibstats(ah, &ahp->ah_mibStats);
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
         REG_WRITE(ah, AR_FILT_OFDM, 0);
         REG_WRITE(ah, AR_FILT_CCK, 0);
@@ -662,21 +642,19 @@ void ath9k_enable_mib_counters(struct ath_hal *ah)
         REG_WRITE(ah, AR_PHY_ERR_MASK_2, AR_PHY_ERR_CCK_TIMING);
 }
 
-void ath9k_hw_disable_mib_counters(struct ath_hal *ah)
+void ath9k_hw_disable_mib_counters(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
         DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Disable MIB counters\n");
 
         REG_WRITE(ah, AR_MIBC, AR_MIBC_FMC | AR_MIBC_CMC);
 
-        ath9k_hw_update_mibstats(ah, &ahp->ah_mibStats);
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
 
         REG_WRITE(ah, AR_FILT_OFDM, 0);
         REG_WRITE(ah, AR_FILT_CCK, 0);
 }
 
-u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hal *ah,
+u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hw *ah,
                                   u32 *rxc_pcnt,
                                   u32 *rxf_pcnt,
                                   u32 *txf_pcnt)
@@ -721,10 +699,9 @@ u32 ath9k_hw_GetMibCycleCountsPct(struct ath_hal *ah,
  * any of the MIB counters overflow/trigger so don't assume we're
  * here because a PHY error counter triggered.
  */
-void ath9k_hw_procmibevent(struct ath_hal *ah,
+void ath9k_hw_procmibevent(struct ath_hw *ah,
                            const struct ath9k_node_stats *stats)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         u32 phyCnt1, phyCnt2;
 
         /* Reset these counters regardless */
@@ -734,8 +711,8 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,
                 REG_WRITE(ah, AR_SLP_MIB_CTRL, AR_SLP_MIB_CLEAR);
 
         /* Clear the mib counters and save them in the stats */
-        ath9k_hw_update_mibstats(ah, &ahp->ah_mibStats);
-        ahp->ah_stats.ast_nodestats = *stats;
+        ath9k_hw_update_mibstats(ah, &ah->ah_mibStats);
+        ah->stats.ast_nodestats = *stats;
 
         if (!DO_ANI(ah))
                 return;
@@ -745,17 +722,17 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,
         phyCnt2 = REG_READ(ah, AR_PHY_ERR_2);
         if (((phyCnt1 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK) ||
             ((phyCnt2 & AR_MIBCNT_INTRMASK) == AR_MIBCNT_INTRMASK)) {
-                struct ar5416AniState *aniState = ahp->ah_curani;
+                struct ar5416AniState *aniState = ah->curani;
                 u32 ofdmPhyErrCnt, cckPhyErrCnt;
 
                 /* NB: only use ast_ani_*errs with AH_PRIVATE_DIAG */
                 ofdmPhyErrCnt = phyCnt1 - aniState->ofdmPhyErrBase;
-                ahp->ah_stats.ast_ani_ofdmerrs +=
+                ah->stats.ast_ani_ofdmerrs +=
                         ofdmPhyErrCnt - aniState->ofdmPhyErrCount;
                 aniState->ofdmPhyErrCount = ofdmPhyErrCnt;
 
                 cckPhyErrCnt = phyCnt2 - aniState->cckPhyErrBase;
-                ahp->ah_stats.ast_ani_cckerrs +=
+                ah->stats.ast_ani_cckerrs +=
                         cckPhyErrCnt - aniState->cckPhyErrCount;
                 aniState->cckPhyErrCount = cckPhyErrCnt;
 
@@ -774,9 +751,8 @@ void ath9k_hw_procmibevent(struct ath_hal *ah,
         }
 }
 
-void ath9k_hw_ani_setup(struct ath_hal *ah)
+void ath9k_hw_ani_setup(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         int i;
 
         const int totalSizeDesired[] = { -55, -55, -55, -55, -62 };
@@ -785,66 +761,63 @@ void ath9k_hw_ani_setup(struct ath_hal *ah)
         const int firpwr[] = { -78, -78, -78, -78, -80 };
 
         for (i = 0; i < 5; i++) {
-                ahp->ah_totalSizeDesired[i] = totalSizeDesired[i];
-                ahp->ah_coarseHigh[i] = coarseHigh[i];
-                ahp->ah_coarseLow[i] = coarseLow[i];
-                ahp->ah_firpwr[i] = firpwr[i];
+                ah->totalSizeDesired[i] = totalSizeDesired[i];
+                ah->coarse_high[i] = coarseHigh[i];
+                ah->coarse_low[i] = coarseLow[i];
+                ah->firpwr[i] = firpwr[i];
         }
 }
 
-void ath9k_hw_ani_attach(struct ath_hal *ah)
+void ath9k_hw_ani_attach(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
         int i;
 
         DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Attach ANI\n");
 
-        ahp->ah_hasHwPhyCounters = 1;
-
-        memset(ahp->ah_ani, 0, sizeof(ahp->ah_ani));
-        for (i = 0; i < ARRAY_SIZE(ahp->ah_ani); i++) {
-                ahp->ah_ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH;
-                ahp->ah_ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW;
-                ahp->ah_ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH;
-                ahp->ah_ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW;
-                ahp->ah_ani[i].rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
-                ahp->ah_ani[i].rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
-                ahp->ah_ani[i].ofdmWeakSigDetectOff =
+        ah->has_hw_phycounters = 1;
+
+        memset(ah->ani, 0, sizeof(ah->ani));
+        for (i = 0; i < ARRAY_SIZE(ah->ani); i++) {
+                ah->ani[i].ofdmTrigHigh = ATH9K_ANI_OFDM_TRIG_HIGH;
+                ah->ani[i].ofdmTrigLow = ATH9K_ANI_OFDM_TRIG_LOW;
+                ah->ani[i].cckTrigHigh = ATH9K_ANI_CCK_TRIG_HIGH;
+                ah->ani[i].cckTrigLow = ATH9K_ANI_CCK_TRIG_LOW;
+                ah->ani[i].rssiThrHigh = ATH9K_ANI_RSSI_THR_HIGH;
+                ah->ani[i].rssiThrLow = ATH9K_ANI_RSSI_THR_LOW;
+                ah->ani[i].ofdmWeakSigDetectOff =
                         !ATH9K_ANI_USE_OFDM_WEAK_SIG;
-                ahp->ah_ani[i].cckWeakSigThreshold =
+                ah->ani[i].cckWeakSigThreshold =
                         ATH9K_ANI_CCK_WEAK_SIG_THR;
-                ahp->ah_ani[i].spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
-                ahp->ah_ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
-                if (ahp->ah_hasHwPhyCounters) {
-                        ahp->ah_ani[i].ofdmPhyErrBase =
+                ah->ani[i].spurImmunityLevel = ATH9K_ANI_SPUR_IMMUNE_LVL;
+                ah->ani[i].firstepLevel = ATH9K_ANI_FIRSTEP_LVL;
+                if (ah->has_hw_phycounters) {
+                        ah->ani[i].ofdmPhyErrBase =
                                 AR_PHY_COUNTMAX - ATH9K_ANI_OFDM_TRIG_HIGH;
-                        ahp->ah_ani[i].cckPhyErrBase =
+                        ah->ani[i].cckPhyErrBase =
                                 AR_PHY_COUNTMAX - ATH9K_ANI_CCK_TRIG_HIGH;
                 }
         }
-        if (ahp->ah_hasHwPhyCounters) {
+        if (ah->has_hw_phycounters) {
                 DPRINTF(ah->ah_sc, ATH_DBG_ANI,
                         "Setting OfdmErrBase = 0x%08x\n",
-                        ahp->ah_ani[0].ofdmPhyErrBase);
+                        ah->ani[0].ofdmPhyErrBase);
                 DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Setting cckErrBase = 0x%08x\n",
-                        ahp->ah_ani[0].cckPhyErrBase);
+                        ah->ani[0].cckPhyErrBase);
 
-                REG_WRITE(ah, AR_PHY_ERR_1, ahp->ah_ani[0].ofdmPhyErrBase);
-                REG_WRITE(ah, AR_PHY_ERR_2, ahp->ah_ani[0].cckPhyErrBase);
+                REG_WRITE(ah, AR_PHY_ERR_1, ah->ani[0].ofdmPhyErrBase);
+                REG_WRITE(ah, AR_PHY_ERR_2, ah->ani[0].cckPhyErrBase);
                 ath9k_enable_mib_counters(ah);
         }
-        ahp->ah_aniPeriod = ATH9K_ANI_PERIOD;
-        if (ah->ah_config.enable_ani)
-                ahp->ah_procPhyErr |= HAL_PROCESS_ANI;
+        ah->aniperiod = ATH9K_ANI_PERIOD;
+        if (ah->config.enable_ani)
+                ah->proc_phyerr |= HAL_PROCESS_ANI;
 }
 
-void ath9k_hw_ani_detach(struct ath_hal *ah)
+void ath9k_hw_ani_detach(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
         DPRINTF(ah->ah_sc, ATH_DBG_ANI, "Detach ANI\n");
 
-        if (ahp->ah_hasHwPhyCounters) {
+        if (ah->has_hw_phycounters) {
                 ath9k_hw_disable_mib_counters(ah);
                 REG_WRITE(ah, AR_PHY_ERR_1, 0);
                 REG_WRITE(ah, AR_PHY_ERR_2, 0);