rt2800usb: reorganize code in rt2800usb_probe_hw_mode()

Move hw_mode information initialization code block before
HT information initialization one to match the ordering used
by rt2800pci's rt2800pci_probe_hw_mode().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Acked-by: Ivo van Doorn <IvDoorn@gmail.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 347c14d..36acb38 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -795,6 +795,27 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
        rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &eeprom);
 
        /*
+        * Initialize hw_mode information.
+        */
+       spec->supported_bands = SUPPORT_BAND_2GHZ;
+       spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
+
+       if (rt2x00_rf(&rt2x00dev->chip, RF2820) ||
+           rt2x00_rf(&rt2x00dev->chip, RF2720)) {
+               spec->num_channels = 14;
+               spec->channels = rf_vals;
+       } else if (rt2x00_rf(&rt2x00dev->chip, RF2850) ||
+                  rt2x00_rf(&rt2x00dev->chip, RF2750)) {
+               spec->supported_bands |= SUPPORT_BAND_5GHZ;
+               spec->num_channels = ARRAY_SIZE(rf_vals);
+               spec->channels = rf_vals;
+       } else if (rt2x00_rf(&rt2x00dev->chip, RF3020) ||
+                  rt2x00_rf(&rt2x00dev->chip, RF2020)) {
+               spec->num_channels = ARRAY_SIZE(rf_vals_3070);
+               spec->channels = rf_vals_3070;
+       }
+
+       /*
         * Initialize HT information.
         */
        spec->ht.ht_supported = true;
@@ -826,27 +847,6 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
        }
 
        /*
-        * Initialize hw_mode information.
-        */
-       spec->supported_bands = SUPPORT_BAND_2GHZ;
-       spec->supported_rates = SUPPORT_RATE_CCK | SUPPORT_RATE_OFDM;
-
-       if (rt2x00_rf(&rt2x00dev->chip, RF2820) ||
-           rt2x00_rf(&rt2x00dev->chip, RF2720)) {
-               spec->num_channels = 14;
-               spec->channels = rf_vals;
-       } else if (rt2x00_rf(&rt2x00dev->chip, RF2850) ||
-                  rt2x00_rf(&rt2x00dev->chip, RF2750)) {
-               spec->supported_bands |= SUPPORT_BAND_5GHZ;
-               spec->num_channels = ARRAY_SIZE(rf_vals);
-               spec->channels = rf_vals;
-       } else if (rt2x00_rf(&rt2x00dev->chip, RF3020) ||
-                  rt2x00_rf(&rt2x00dev->chip, RF2020)) {
-               spec->num_channels = ARRAY_SIZE(rf_vals_3070);
-               spec->channels = rf_vals_3070;
-       }
-
-       /*
         * Create channel information array
         */
        info = kzalloc(spec->num_channels * sizeof(*info), GFP_KERNEL);