rt2x00: remove unneeded check

Remove band check from rf53xx channel config routine since all chips
using it are single band.

Signed-off-by: Tomislav Požega <pozega.tomislav@gmail.com>
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 7f813f6f879240d317202049ffc270472f31a8d7..0165e274a88469d2ca89aee31ffa0a67ff8a4d57 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -2966,6 +2966,7 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
                                         struct channel_info *info)
 {
        u8 rfcsr;
+       int idx = rf->channel-1;
 
        rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
        rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
@@ -3003,60 +3004,56 @@ static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
 
        rt2800_freq_cal_mode1(rt2x00dev);
 
-       if (rf->channel <= 14) {
-               int idx = rf->channel-1;
-
-               if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
-                       if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
-                               /* r55/r59 value array of channel 1~14 */
-                               static const char r55_bt_rev[] = {0x83, 0x83,
-                                       0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
-                                       0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
-                               static const char r59_bt_rev[] = {0x0e, 0x0e,
-                                       0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
-                                       0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
-
-                               rt2800_rfcsr_write(rt2x00dev, 55,
-                                                  r55_bt_rev[idx]);
-                               rt2800_rfcsr_write(rt2x00dev, 59,
-                                                  r59_bt_rev[idx]);
-                       } else {
-                               static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
-                                       0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
-                                       0x88, 0x88, 0x86, 0x85, 0x84};
-
-                               rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
-                       }
+       if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
+               if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
+                       /* r55/r59 value array of channel 1~14 */
+                       static const char r55_bt_rev[] = {0x83, 0x83,
+                               0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
+                               0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
+                       static const char r59_bt_rev[] = {0x0e, 0x0e,
+                               0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
+                               0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
+
+                       rt2800_rfcsr_write(rt2x00dev, 55,
+                                          r55_bt_rev[idx]);
+                       rt2800_rfcsr_write(rt2x00dev, 59,
+                                          r59_bt_rev[idx]);
                } else {
-                       if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
-                               static const char r55_nonbt_rev[] = {0x23, 0x23,
-                                       0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
-                                       0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
-                               static const char r59_nonbt_rev[] = {0x07, 0x07,
-                                       0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
-                                       0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
-
-                               rt2800_rfcsr_write(rt2x00dev, 55,
-                                                  r55_nonbt_rev[idx]);
-                               rt2800_rfcsr_write(rt2x00dev, 59,
-                                                  r59_nonbt_rev[idx]);
-                       } else if (rt2x00_rt(rt2x00dev, RT5390) ||
-                                  rt2x00_rt(rt2x00dev, RT5392) ||
-                                  rt2x00_rt(rt2x00dev, RT6352)) {
-                               static const char r59_non_bt[] = {0x8f, 0x8f,
-                                       0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
-                                       0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
-
-                               rt2800_rfcsr_write(rt2x00dev, 59,
-                                                  r59_non_bt[idx]);
-                       } else if (rt2x00_rt(rt2x00dev, RT5350)) {
-                               static const char r59_non_bt[] = {0x0b, 0x0b,
-                                       0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
-                                       0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
-
-                               rt2800_rfcsr_write(rt2x00dev, 59,
-                                                  r59_non_bt[idx]);
-                       }
+                       static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
+                               0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
+                               0x88, 0x88, 0x86, 0x85, 0x84};
+
+                       rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
+               }
+       } else {
+               if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
+                       static const char r55_nonbt_rev[] = {0x23, 0x23,
+                               0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
+                               0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
+                       static const char r59_nonbt_rev[] = {0x07, 0x07,
+                               0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
+                               0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
+
+                       rt2800_rfcsr_write(rt2x00dev, 55,
+                                          r55_nonbt_rev[idx]);
+                       rt2800_rfcsr_write(rt2x00dev, 59,
+                                          r59_nonbt_rev[idx]);
+               } else if (rt2x00_rt(rt2x00dev, RT5390) ||
+                          rt2x00_rt(rt2x00dev, RT5392) ||
+                          rt2x00_rt(rt2x00dev, RT6352)) {
+                       static const char r59_non_bt[] = {0x8f, 0x8f,
+                               0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
+                               0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
+
+                       rt2800_rfcsr_write(rt2x00dev, 59,
+                                          r59_non_bt[idx]);
+               } else if (rt2x00_rt(rt2x00dev, RT5350)) {
+                       static const char r59_non_bt[] = {0x0b, 0x0b,
+                               0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
+                               0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
+
+                       rt2800_rfcsr_write(rt2x00dev, 59,
+                                          r59_non_bt[idx]);
                }
        }
 }