ath9k: Merge ath_hal and ath_hal_5416 structures

Finally, merge these structures and have a single
HW specific data structure.

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

1 files changed, 91 insertions, 103 deletions

diff --git a/drivers/net/wireless/ath9k/phy.c b/drivers/net/wireless/ath9k/phy.c
index ea29941412d4..da4165b8d6be 100644
--- a/drivers/net/wireless/ath9k/phy.c
+++ b/drivers/net/wireless/ath9k/phy.c
@@ -17,16 +17,14 @@
 #include "ath9k.h"
 
 void
-ath9k_hw_write_regs(struct ath_hal *ah, u32 modesIndex, u32 freqIndex,
+ath9k_hw_write_regs(struct ath_hw *ah, u32 modesIndex, u32 freqIndex,
                     int regWrites)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
-        REG_WRITE_ARRAY(&ahp->ah_iniBB_RfGain, freqIndex, regWrites);
+        REG_WRITE_ARRAY(&ah->ah_iniBB_RfGain, freqIndex, regWrites);
 }
 
 bool
-ath9k_hw_set_channel(struct ath_hal *ah, struct ath9k_channel *chan)
+ath9k_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
 {
         u32 channelSel = 0;
         u32 bModeSynth = 0;
@@ -93,14 +91,13 @@ ath9k_hw_set_channel(struct ath_hal *ah, struct ath9k_channel *chan)
         REG_WRITE(ah, AR_PHY(0x37), reg32);
 
         ah->ah_curchan = chan;
-
-        AH5416(ah)->ah_curchanRadIndex = -1;
+        ah->ah_curchanRadIndex = -1;
 
         return true;
 }
 
 bool
-ath9k_hw_ar9280_set_channel(struct ath_hal *ah,
+ath9k_hw_ar9280_set_channel(struct ath_hw *ah,
                             struct ath9k_channel *chan)
 {
         u16 bMode, fracMode, aModeRefSel = 0;
@@ -164,8 +161,7 @@ ath9k_hw_ar9280_set_channel(struct ath_hal *ah,
         REG_WRITE(ah, AR_PHY_SYNTH_CONTROL, reg32);
 
         ah->ah_curchan = chan;
-
-        AH5416(ah)->ah_curchanRadIndex = -1;
+        ah->ah_curchanRadIndex = -1;
 
         return true;
 }
@@ -198,11 +194,9 @@ ath9k_phy_modify_rx_buffer(u32 *rfBuf, u32 reg32,
 }
 
 bool
-ath9k_hw_set_rf_regs(struct ath_hal *ah, struct ath9k_channel *chan,
+ath9k_hw_set_rf_regs(struct ath_hw *ah, struct ath9k_channel *chan,
                      u16 modesIndex)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
         u32 eepMinorRev;
         u32 ob5GHz = 0, db5GHz = 0;
         u32 ob2GHz = 0, db2GHz = 0;
@@ -213,19 +207,19 @@ ath9k_hw_set_rf_regs(struct ath_hal *ah, struct ath9k_channel *chan,
 
         eepMinorRev = ath9k_hw_get_eeprom(ah, EEP_MINOR_REV);
 
-        RF_BANK_SETUP(ahp->ah_analogBank0Data, &ahp->ah_iniBank0, 1);
+        RF_BANK_SETUP(ah->ah_analogBank0Data, &ah->ah_iniBank0, 1);
 
-        RF_BANK_SETUP(ahp->ah_analogBank1Data, &ahp->ah_iniBank1, 1);
+        RF_BANK_SETUP(ah->ah_analogBank1Data, &ah->ah_iniBank1, 1);
 
-        RF_BANK_SETUP(ahp->ah_analogBank2Data, &ahp->ah_iniBank2, 1);
+        RF_BANK_SETUP(ah->ah_analogBank2Data, &ah->ah_iniBank2, 1);
 
-        RF_BANK_SETUP(ahp->ah_analogBank3Data, &ahp->ah_iniBank3,
+        RF_BANK_SETUP(ah->ah_analogBank3Data, &ah->ah_iniBank3,
                       modesIndex);
         {
                 int i;
-                for (i = 0; i < ahp->ah_iniBank6TPC.ia_rows; i++) {
-                        ahp->ah_analogBank6Data[i] =
-                            INI_RA(&ahp->ah_iniBank6TPC, i, modesIndex);
+                for (i = 0; i < ah->ah_iniBank6TPC.ia_rows; i++) {
+                        ah->ah_analogBank6Data[i] =
+                            INI_RA(&ah->ah_iniBank6TPC, i, modesIndex);
                 }
         }
 
@@ -233,137 +227,132 @@ ath9k_hw_set_rf_regs(struct ath_hal *ah, struct ath9k_channel *chan,
                 if (IS_CHAN_2GHZ(chan)) {
                         ob2GHz = ath9k_hw_get_eeprom(ah, EEP_OB_2);
                         db2GHz = ath9k_hw_get_eeprom(ah, EEP_DB_2);
-                        ath9k_phy_modify_rx_buffer(ahp->ah_analogBank6Data,
+                        ath9k_phy_modify_rx_buffer(ah->ah_analogBank6Data,
                                                    ob2GHz, 3, 197, 0);
-                        ath9k_phy_modify_rx_buffer(ahp->ah_analogBank6Data,
+                        ath9k_phy_modify_rx_buffer(ah->ah_analogBank6Data,
                                                    db2GHz, 3, 194, 0);
                 } else {
                         ob5GHz = ath9k_hw_get_eeprom(ah, EEP_OB_5);
                         db5GHz = ath9k_hw_get_eeprom(ah, EEP_DB_5);
-                        ath9k_phy_modify_rx_buffer(ahp->ah_analogBank6Data,
+                        ath9k_phy_modify_rx_buffer(ah->ah_analogBank6Data,
                                                    ob5GHz, 3, 203, 0);
-                        ath9k_phy_modify_rx_buffer(ahp->ah_analogBank6Data,
+                        ath9k_phy_modify_rx_buffer(ah->ah_analogBank6Data,
                                                    db5GHz, 3, 200, 0);
                 }
         }
 
-        RF_BANK_SETUP(ahp->ah_analogBank7Data, &ahp->ah_iniBank7, 1);
+        RF_BANK_SETUP(ah->ah_analogBank7Data, &ah->ah_iniBank7, 1);
 
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank0, ahp->ah_analogBank0Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank0, ah->ah_analogBank0Data,
                            regWrites);
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank1, ahp->ah_analogBank1Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank1, ah->ah_analogBank1Data,
                            regWrites);
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank2, ahp->ah_analogBank2Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank2, ah->ah_analogBank2Data,
                            regWrites);
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank3, ahp->ah_analogBank3Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank3, ah->ah_analogBank3Data,
                            regWrites);
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank6TPC, ahp->ah_analogBank6Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank6TPC, ah->ah_analogBank6Data,
                            regWrites);
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank7, ahp->ah_analogBank7Data,
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank7, ah->ah_analogBank7Data,
                            regWrites);
 
         return true;
 }
 
 void
-ath9k_hw_rfdetach(struct ath_hal *ah)
+ath9k_hw_rfdetach(struct ath_hw *ah)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
-        if (ahp->ah_analogBank0Data != NULL) {
-                kfree(ahp->ah_analogBank0Data);
-                ahp->ah_analogBank0Data = NULL;
+        if (ah->ah_analogBank0Data != NULL) {
+                kfree(ah->ah_analogBank0Data);
+                ah->ah_analogBank0Data = NULL;
         }
-        if (ahp->ah_analogBank1Data != NULL) {
-                kfree(ahp->ah_analogBank1Data);
-                ahp->ah_analogBank1Data = NULL;
+        if (ah->ah_analogBank1Data != NULL) {
+                kfree(ah->ah_analogBank1Data);
+                ah->ah_analogBank1Data = NULL;
         }
-        if (ahp->ah_analogBank2Data != NULL) {
-                kfree(ahp->ah_analogBank2Data);
-                ahp->ah_analogBank2Data = NULL;
+        if (ah->ah_analogBank2Data != NULL) {
+                kfree(ah->ah_analogBank2Data);
+                ah->ah_analogBank2Data = NULL;
         }
-        if (ahp->ah_analogBank3Data != NULL) {
-                kfree(ahp->ah_analogBank3Data);
-                ahp->ah_analogBank3Data = NULL;
+        if (ah->ah_analogBank3Data != NULL) {
+                kfree(ah->ah_analogBank3Data);
+                ah->ah_analogBank3Data = NULL;
         }
-        if (ahp->ah_analogBank6Data != NULL) {
-                kfree(ahp->ah_analogBank6Data);
-                ahp->ah_analogBank6Data = NULL;
+        if (ah->ah_analogBank6Data != NULL) {
+                kfree(ah->ah_analogBank6Data);
+                ah->ah_analogBank6Data = NULL;
         }
-        if (ahp->ah_analogBank6TPCData != NULL) {
-                kfree(ahp->ah_analogBank6TPCData);
-                ahp->ah_analogBank6TPCData = NULL;
+        if (ah->ah_analogBank6TPCData != NULL) {
+                kfree(ah->ah_analogBank6TPCData);
+                ah->ah_analogBank6TPCData = NULL;
         }
-        if (ahp->ah_analogBank7Data != NULL) {
-                kfree(ahp->ah_analogBank7Data);
-                ahp->ah_analogBank7Data = NULL;
+        if (ah->ah_analogBank7Data != NULL) {
+                kfree(ah->ah_analogBank7Data);
+                ah->ah_analogBank7Data = NULL;
         }
-        if (ahp->ah_addac5416_21 != NULL) {
-                kfree(ahp->ah_addac5416_21);
-                ahp->ah_addac5416_21 = NULL;
+        if (ah->ah_addac5416_21 != NULL) {
+                kfree(ah->ah_addac5416_21);
+                ah->ah_addac5416_21 = NULL;
         }
-        if (ahp->ah_bank6Temp != NULL) {
-                kfree(ahp->ah_bank6Temp);
-                ahp->ah_bank6Temp = NULL;
+        if (ah->ah_bank6Temp != NULL) {
+                kfree(ah->ah_bank6Temp);
+                ah->ah_bank6Temp = NULL;
         }
 }
 
-bool ath9k_hw_init_rf(struct ath_hal *ah, int *status)
+bool ath9k_hw_init_rf(struct ath_hw *ah, int *status)
 {
-        struct ath_hal_5416 *ahp = AH5416(ah);
-
         if (!AR_SREV_9280_10_OR_LATER(ah)) {
-
-                ahp->ah_analogBank0Data =
+                ah->ah_analogBank0Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank0.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank1Data =
+                             ah->ah_iniBank0.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank1Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank1.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank2Data =
+                             ah->ah_iniBank1.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank2Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank2.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank3Data =
+                             ah->ah_iniBank2.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank3Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank3.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank6Data =
+                             ah->ah_iniBank3.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank6Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank6.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank6TPCData =
+                             ah->ah_iniBank6.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank6TPCData =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank6TPC.ia_rows), GFP_KERNEL);
-                ahp->ah_analogBank7Data =
+                             ah->ah_iniBank6TPC.ia_rows), GFP_KERNEL);
+                ah->ah_analogBank7Data =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank7.ia_rows), GFP_KERNEL);
-
-                if (ahp->ah_analogBank0Data == NULL
-                    || ahp->ah_analogBank1Data == NULL
-                    || ahp->ah_analogBank2Data == NULL
-                    || ahp->ah_analogBank3Data == NULL
-                    || ahp->ah_analogBank6Data == NULL
-                    || ahp->ah_analogBank6TPCData == NULL
-                    || ahp->ah_analogBank7Data == NULL) {
+                             ah->ah_iniBank7.ia_rows), GFP_KERNEL);
+
+                if (ah->ah_analogBank0Data == NULL
+                    || ah->ah_analogBank1Data == NULL
+                    || ah->ah_analogBank2Data == NULL
+                    || ah->ah_analogBank3Data == NULL
+                    || ah->ah_analogBank6Data == NULL
+                    || ah->ah_analogBank6TPCData == NULL
+                    || ah->ah_analogBank7Data == NULL) {
                         DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                 "Cannot allocate RF banks\n");
                         *status = -ENOMEM;
                         return false;
                 }
 
-                ahp->ah_addac5416_21 =
+                ah->ah_addac5416_21 =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniAddac.ia_rows *
-                             ahp->ah_iniAddac.ia_columns), GFP_KERNEL);
-                if (ahp->ah_addac5416_21 == NULL) {
+                             ah->ah_iniAddac.ia_rows *
+                             ah->ah_iniAddac.ia_columns), GFP_KERNEL);
+                if (ah->ah_addac5416_21 == NULL) {
                         DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                 "Cannot allocate ah_addac5416_21\n");
                         *status = -ENOMEM;
                         return false;
                 }
 
-                ahp->ah_bank6Temp =
+                ah->ah_bank6Temp =
                     kzalloc((sizeof(u32) *
-                             ahp->ah_iniBank6.ia_rows), GFP_KERNEL);
-                if (ahp->ah_bank6Temp == NULL) {
+                             ah->ah_iniBank6.ia_rows), GFP_KERNEL);
+                if (ah->ah_bank6Temp == NULL) {
                         DPRINTF(ah->ah_sc, ATH_DBG_FATAL,
                                 "Cannot allocate ah_bank6Temp\n");
                         *status = -ENOMEM;
@@ -375,23 +364,22 @@ bool ath9k_hw_init_rf(struct ath_hal *ah, int *status)
 }
 
 void
-ath9k_hw_decrease_chain_power(struct ath_hal *ah, struct ath9k_channel *chan)
+ath9k_hw_decrease_chain_power(struct ath_hw *ah, struct ath9k_channel *chan)
 {
         int i, regWrites = 0;
-        struct ath_hal_5416 *ahp = AH5416(ah);
         u32 bank6SelMask;
-        u32 *bank6Temp = ahp->ah_bank6Temp;
+        u32 *bank6Temp = ah->ah_bank6Temp;
 
-        switch (ahp->ah_diversityControl) {
+        switch (ah->ah_diversityControl) {
         case ATH9K_ANT_FIXED_A:
                 bank6SelMask =
-                    (ahp->
+                    (ah->
                      ah_antennaSwitchSwap & ANTSWAP_AB) ? REDUCE_CHAIN_0 :
                     REDUCE_CHAIN_1;
                 break;
         case ATH9K_ANT_FIXED_B:
                 bank6SelMask =
-                    (ahp->
+                    (ah->
                      ah_antennaSwitchSwap & ANTSWAP_AB) ? REDUCE_CHAIN_1 :
                     REDUCE_CHAIN_0;
                 break;
@@ -403,8 +391,8 @@ ath9k_hw_decrease_chain_power(struct ath_hal *ah, struct ath9k_channel *chan)
                 break;
         }
 
-        for (i = 0; i < ahp->ah_iniBank6.ia_rows; i++)
-                bank6Temp[i] = ahp->ah_analogBank6Data[i];
+        for (i = 0; i < ah->ah_iniBank6.ia_rows; i++)
+                bank6Temp[i] = ah->ah_analogBank6Data[i];
 
         REG_WRITE(ah, AR_PHY_BASE + 0xD8, bank6SelMask);
 
@@ -418,7 +406,7 @@ ath9k_hw_decrease_chain_power(struct ath_hal *ah, struct ath9k_channel *chan)
         ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 246, 0);
         ath9k_phy_modify_rx_buffer(bank6Temp, 1, 1, 247, 0);
 
-        REG_WRITE_RF_ARRAY(&ahp->ah_iniBank6, bank6Temp, regWrites);
+        REG_WRITE_RF_ARRAY(&ah->ah_iniBank6, bank6Temp, regWrites);
 
         REG_WRITE(ah, AR_PHY_BASE + 0xD8, 0x00000053);
 #ifdef ALTER_SWITCH