1 files changed, 3 insertions, 35 deletions

diff --git a/drivers/net/wireless/ath/ath9k/eeprom_def.c b/drivers/net/wireless/ath/ath9k/eeprom_def.c
index 619b95d764ff..b5fba8b18b8b 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_def.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_def.c
@@ -991,9 +991,6 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
                                                   u16 antenna_reduction,
                                                   u16 powerLimit)
 {
-#define REDUCE_SCALED_POWER_BY_TWO_CHAIN     6  /* 10*log10(2)*2 */
-#define REDUCE_SCALED_POWER_BY_THREE_CHAIN   9 /* 10*log10(3)*2 */
-
         struct ar5416_eeprom_def *pEepData = &ah->eeprom.def;
         u16 twiceMaxEdgePower;
         int i;
@@ -1027,24 +1024,8 @@ static void ath9k_hw_set_def_power_per_rate_table(struct ath_hw *ah,
 
         ath9k_hw_get_channel_centers(ah, chan, &centers);
 
-        scaledPower = powerLimit - antenna_reduction;
-
-        switch (ar5416_get_ntxchains(tx_chainmask)) {
-        case 1:
-                break;
-        case 2:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_TWO_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_TWO_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        case 3:
-                if (scaledPower > REDUCE_SCALED_POWER_BY_THREE_CHAIN)
-                        scaledPower -= REDUCE_SCALED_POWER_BY_THREE_CHAIN;
-                else
-                        scaledPower = 0;
-                break;
-        }
+        scaledPower = ath9k_hw_get_scaled_power(ah, powerLimit,
+                                                antenna_reduction);
 
         if (IS_CHAN_2GHZ(chan)) {
                 numCtlModes = ARRAY_SIZE(ctlModesFor11g) -
@@ -1263,20 +1244,7 @@ static void ath9k_hw_def_set_txpower(struct ath_hw *ah,
                         regulatory->max_power_level = ratesArray[i];
         }
 
-        switch(ar5416_get_ntxchains(ah->txchainmask)) {
-        case 1:
-                break;
-        case 2:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_TWO_CHAIN;
-                break;
-        case 3:
-                regulatory->max_power_level += INCREASE_MAXPOW_BY_THREE_CHAIN;
-                break;
-        default:
-                ath_dbg(ath9k_hw_common(ah), EEPROM,
-                        "Invalid chainmask configuration\n");
-                break;
-        }
+        ath9k_hw_update_regulatory_maxpower(ah);
 
         if (test)
                 return;