rt2x00: Gather channel information in structure

Channel information which is read from EEPROM should
be read into an array containing per-channel information.
This removes the requirement of multiple arrays and makes
the channel handling a bit cleaner and easier to expand.

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

1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 182952249a19..328ff8bc4c16 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -818,7 +818,6 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
         struct ieee80211_rate *rates;
         unsigned int num_rates;
         unsigned int i;
-        unsigned char tx_power;
 
         num_rates = 0;
         if (spec->supported_rates & SUPPORT_RATE_CCK)
@@ -844,20 +843,9 @@ static int rt2x00lib_probe_hw_modes(struct rt2x00_dev *rt2x00dev,
          * Initialize Channel list.
          */
         for (i = 0; i < spec->num_channels; i++) {
-                if (spec->channels[i].channel <= 14) {
-                        if (spec->tx_power_bg)
-                                tx_power = spec->tx_power_bg[i];
-                        else
-                                tx_power = spec->tx_power_default;
-                } else {
-                        if (spec->tx_power_a)
-                                tx_power = spec->tx_power_a[i];
-                        else
-                                tx_power = spec->tx_power_default;
-                }
-
                 rt2x00lib_channel(&channels[i],
-                                  spec->channels[i].channel, tx_power, i);
+                                  spec->channels[i].channel,
+                                  spec->channels_info[i].tx_power1, i);
         }
 
         /*
@@ -909,6 +897,8 @@ static void rt2x00lib_remove_hw(struct rt2x00_dev *rt2x00dev)
                 rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = NULL;
                 rt2x00dev->hw->wiphy->bands[IEEE80211_BAND_5GHZ] = NULL;
         }
+
+        kfree(rt2x00dev->spec.channels_info);
 }
 
 static int rt2x00lib_probe_hw(struct rt2x00_dev *rt2x00dev)