rt2x00: Restructure bw_comp calculation

Move the HT40 check inside the calculation function to make it easier
for a later cleanup.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
index 2ee6cebb9b25..2f8af7a806ec 100644
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
@@ -1819,11 +1819,15 @@ static int rt2800_get_txpower_bw_comp(struct rt2x00_dev *rt2x00dev,
         u16 eeprom;
         u8 comp_en;
         u8 comp_type;
-        int comp_value;
+        int comp_value = 0;
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_TXPOWER_DELTA, &eeprom);
 
-        if (eeprom == 0xffff)
+        /*
+         * HT40 compensation not required.
+         */
+        if (eeprom == 0xffff ||
+            !test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
                 return 0;
 
         if (band == IEEE80211_BAND_2GHZ) {
@@ -1865,13 +1869,12 @@ static u8 rt2800_compesate_txpower(struct rt2x00_dev *rt2x00dev,
         u8 eirp_txpower;
         u8 eirp_txpower_criterion;
         u8 reg_limit;
-        int bw_comp = 0;
+        int bw_comp;
 
         if (!((band == IEEE80211_BAND_5GHZ) && is_rate_b))
                 return txpower;
 
-        if (test_bit(CONFIG_CHANNEL_HT40, &rt2x00dev->flags))
-                bw_comp = rt2800_get_txpower_bw_comp(rt2x00dev, band);
+        bw_comp = rt2800_get_txpower_bw_comp(rt2x00dev, band);
 
         if (test_bit(CONFIG_SUPPORT_POWER_LIMIT, &rt2x00dev->flags)) {
                 /*