[v2,1/4] rt2x00: remove unneeded check

Message ID	1539082867-4264-1-git-send-email-sgruszka@redhat.com (mailing list archive)
State	Changes Requested
Delegated to:	Kalle Valo
Headers	show Return-Path: <linux-wireless-owner@kernel.org> From: Stanislaw Gruszka <sgruszka@redhat.com> To: linux-wireless@vger.kernel.org Cc: Daniel Golle <daniel@makrotopia.org>, Mathias Kresin <dev@kresin.me>, Felix Fietkau <nbd@nbd.name>, =?utf-8?q?Tomislav_Po=C5=BEega?= <pozega.tomislav@gmail.com> Subject: [PATCH v2 1/4] rt2x00: remove unneeded check Date: Tue, 9 Oct 2018 13:01:04 +0200 Message-Id: <1539082867-4264-1-git-send-email-sgruszka@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk
Series	[v2,1/4] rt2x00: remove unneeded check \| expand [v2,1/4] rt2x00: remove unneeded check [v2,2/4] rt2x00: remove confusing AGC register [v2,3/4] rt2x00: update TX_SW_CFG2 value [v2,4/4] rt2800: fix registers init for MT7620

Message ID

1539082867-4264-1-git-send-email-sgruszka@redhat.com (mailing list archive)

State

Changes Requested

Delegated to:

Kalle Valo

Headers

From: Stanislaw Gruszka <sgruszka@redhat.com>
To: linux-wireless@vger.kernel.org
Cc: Daniel Golle <daniel@makrotopia.org>, Mathias Kresin <dev@kresin.me>,
 Felix Fietkau <nbd@nbd.name>,
 =?utf-8?q?Tomislav_Po=C5=BEega?= <pozega.tomislav@gmail.com>
Subject: [PATCH v2 1/4] rt2x00: remove unneeded check
Date: Tue,  9 Oct 2018 13:01:04 +0200
Message-Id: <1539082867-4264-1-git-send-email-sgruszka@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk

Series

[v2,1/4] rt2x00: remove unneeded check | expand

Commit Message

Stanislaw Gruszka Oct. 9, 2018, 11:01 a.m. UTC

From: Tomislav Požega <pozega.tomislav@gmail.com>

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>
---
 drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 103 ++++++++++++-------------
 1 file changed, 50 insertions(+), 53 deletions(-)

Comments

kernel test robot Oct. 9, 2018, 9:18 p.m. UTC | #1

Hi Tomislav,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on v4.19-rc7 next-20181009]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Stanislaw-Gruszka/rt2x00-remove-unneeded-check/20181010-012334
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: x86_64-allyesconfig (attached as .config)
compiler: gcc-7 (Debian 7.3.0-1) 7.3.0
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All errors (new ones prefixed by >>):

   drivers/net/wireless/ralink/rt2x00/rt2800lib.c: In function 'rt2800_config_channel_rf3290':
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c:2881:6: warning: unused variable 'idx' [-Wunused-variable]
     int idx = rf->channel-1;
         ^~~
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c: In function 'rt2800_config_channel_rf53xx':
>> drivers/net/wireless/ralink/rt2x00/rt2800lib.c:3016:20: error: 'idx' undeclared (first use in this function); did you mean 'ida'?
            r55_bt_rev[idx]);
                       ^~~
                       ida
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c:3016:20: note: each undeclared identifier is reported only once for each function it appears in

vim +3016 drivers/net/wireless/ralink/rt2x00/rt2800lib.c

0c9e5fb91 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2013-03-16  2875  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2876  static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2877  					 struct ieee80211_conf *conf,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2878  					 struct rf_channel *rf,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2879  					 struct channel_info *info)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2880  {
64cc6975c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Tomislav Požega   2018-10-09 @2881  	int idx = rf->channel-1;
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2882  	u8 rfcsr;
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2883  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2884  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2885  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2886  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 11);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2887  	rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2888  	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2889  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2890  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 49);
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2891  	if (info->default_power1 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2892  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2893  	else
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2894  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2895  	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2896  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  2897  	rt2800_freq_cal_mode1(rt2x00dev);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2898  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2899  	if (rf->channel <= 14) {
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2900  		if (rf->channel == 6)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2901  			rt2800_bbp_write(rt2x00dev, 68, 0x0c);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2902  		else
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2903  			rt2800_bbp_write(rt2x00dev, 68, 0x0b);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2904  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2905  		if (rf->channel >= 1 && rf->channel <= 6)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2906  			rt2800_bbp_write(rt2x00dev, 59, 0x0f);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2907  		else if (rf->channel >= 7 && rf->channel <= 11)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2908  			rt2800_bbp_write(rt2x00dev, 59, 0x0e);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2909  		else if (rf->channel >= 12 && rf->channel <= 14)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2910  			rt2800_bbp_write(rt2x00dev, 59, 0x0d);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2911  	}
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2912  }
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2913  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2914  static void rt2800_config_channel_rf3322(struct rt2x00_dev *rt2x00dev,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2915  					 struct ieee80211_conf *conf,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2916  					 struct rf_channel *rf,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2917  					 struct channel_info *info)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2918  {
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2919  	u8 rfcsr;
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2920  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2921  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2922  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2923  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2924  	rt2800_rfcsr_write(rt2x00dev, 11, 0x42);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2925  	rt2800_rfcsr_write(rt2x00dev, 12, 0x1c);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2926  	rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2927  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2928  	if (info->default_power1 > POWER_BOUND)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2929  		rt2800_rfcsr_write(rt2x00dev, 47, POWER_BOUND);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2930  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2931  		rt2800_rfcsr_write(rt2x00dev, 47, info->default_power1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2932  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2933  	if (info->default_power2 > POWER_BOUND)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2934  		rt2800_rfcsr_write(rt2x00dev, 48, POWER_BOUND);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2935  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2936  		rt2800_rfcsr_write(rt2x00dev, 48, info->default_power2);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2937  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  2938  	rt2800_freq_cal_mode1(rt2x00dev);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2939  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2940  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2941  	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2942  	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2943  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2944  	if ( rt2x00dev->default_ant.tx_chain_num == 2 )
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2945  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2946  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2947  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2948  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2949  	if ( rt2x00dev->default_ant.rx_chain_num == 2 )
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2950  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2951  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2952  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2953  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2954  	rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2955  	rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2956  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2957  	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2958  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2959  	rt2800_rfcsr_write(rt2x00dev, 31, 80);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2960  }
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2961  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2962  static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2963  					 struct ieee80211_conf *conf,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2964  					 struct rf_channel *rf,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2965  					 struct channel_info *info)
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2966  {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2967  	u8 rfcsr;
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2968  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2969  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2970  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2971  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 11);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2972  	rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2973  	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2974  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2975  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 49);
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2976  	if (info->default_power1 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2977  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2978  	else
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2979  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2980  	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2981  
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2982  	if (rt2x00_rt(rt2x00dev, RT5392)) {
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2983  		rfcsr = rt2800_rfcsr_read(rt2x00dev, 50);
6264995f8 drivers/net/wireless/rt2x00/rt2800lib.c        Felipe Pena       2013-10-18  2984  		if (info->default_power2 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2985  			rt2x00_set_field8(&rfcsr, RFCSR50_TX, POWER_BOUND);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2986  		else
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2987  			rt2x00_set_field8(&rfcsr, RFCSR50_TX,
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2988  					  info->default_power2);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2989  		rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2990  	}
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2991  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2992  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2993  	if (rt2x00_rt(rt2x00dev, RT5392)) {
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2994  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2995  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2996  	}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2997  	rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2998  	rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2999  	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3000  	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3001  	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3002  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  3003  	rt2800_freq_cal_mode1(rt2x00dev);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3004  
c429dfef7 drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2013-10-11  3005  	if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3006  		if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3007  			/* r55/r59 value array of channel 1~14 */
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3008  			static const char r55_bt_rev[] = {0x83, 0x83,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3009  				0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3010  				0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3011  			static const char r59_bt_rev[] = {0x0e, 0x0e,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3012  				0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3013  				0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3014  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3015  			rt2800_rfcsr_write(rt2x00dev, 55,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03 @3016  					   r55_bt_rev[idx]);
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3017  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3018  					   r59_bt_rev[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3019  		} else {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3020  			static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3021  				0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3022  				0x88, 0x88, 0x86, 0x85, 0x84};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3023  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3024  			rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3025  		}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3026  	} else {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3027  		if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3028  			static const char r55_nonbt_rev[] = {0x23, 0x23,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3029  				0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3030  				0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3031  			static const char r59_nonbt_rev[] = {0x07, 0x07,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3032  				0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3033  				0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3034  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3035  			rt2800_rfcsr_write(rt2x00dev, 55,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3036  					   r55_nonbt_rev[idx]);
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3037  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3038  					   r59_nonbt_rev[idx]);
2ed718844 drivers/net/wireless/rt2x00/rt2800lib.c        John Li           2012-02-17  3039  		} else if (rt2x00_rt(rt2x00dev, RT5390) ||
41977e86c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Roman Yeryomin    2017-03-21  3040  			   rt2x00_rt(rt2x00dev, RT5392) ||
41977e86c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Roman Yeryomin    2017-03-21  3041  			   rt2x00_rt(rt2x00dev, RT6352)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3042  			static const char r59_non_bt[] = {0x8f, 0x8f,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3043  				0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3044  				0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3045  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3046  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3047  					   r59_non_bt[idx]);
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3048  		} else if (rt2x00_rt(rt2x00dev, RT5350)) {
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3049  			static const char r59_non_bt[] = {0x0b, 0x0b,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3050  				0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3051  				0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3052  
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3053  			rt2800_rfcsr_write(rt2x00dev, 59,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3054  					   r59_non_bt[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3055  		}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3056  	}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3057  }
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3058  

:::::: The code at line 3016 was first introduced by commit
:::::: adde5882bc6c21de7ee80ee15dfd58c7e9a472ac rt2x00: fix whitespace damage in the rt2800 specific code

:::::: TO: Gabor Juhos <juhosg@openwrt.org>
:::::: CC: John W. Linville <linville@tuxdriver.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

kernel test robot Oct. 10, 2018, 2:47 a.m. UTC | #2

Hi Tomislav,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on v4.19-rc7 next-20181009]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Stanislaw-Gruszka/rt2x00-remove-unneeded-check/20181010-012334
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: openrisc-allmodconfig (attached as .config)
compiler: or1k-linux-gcc (GCC) 6.0.0 20160327 (experimental)
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=openrisc 

All errors (new ones prefixed by >>):

   drivers/net/wireless/ralink/rt2x00/rt2800lib.c: In function 'rt2800_config_channel_rf3290':
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c:2881:6: warning: unused variable 'idx' [-Wunused-variable]
     int idx = rf->channel-1;
         ^~~
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c: In function 'rt2800_config_channel_rf53xx':
>> drivers/net/wireless/ralink/rt2x00/rt2800lib.c:3016:20: error: 'idx' undeclared (first use in this function)
            r55_bt_rev[idx]);
                       ^~~
   drivers/net/wireless/ralink/rt2x00/rt2800lib.c:3016:20: note: each undeclared identifier is reported only once for each function it appears in

vim +/idx +3016 drivers/net/wireless/ralink/rt2x00/rt2800lib.c

0c9e5fb91 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2013-03-16  2875  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2876  static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2877  					 struct ieee80211_conf *conf,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2878  					 struct rf_channel *rf,
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2879  					 struct channel_info *info)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2880  {
64cc6975c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Tomislav Požega   2018-10-09 @2881  	int idx = rf->channel-1;
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2882  	u8 rfcsr;
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2883  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2884  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2885  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2886  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 11);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2887  	rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2888  	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2889  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2890  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 49);
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2891  	if (info->default_power1 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2892  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2893  	else
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2894  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2895  	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2896  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  2897  	rt2800_freq_cal_mode1(rt2x00dev);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2898  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2899  	if (rf->channel <= 14) {
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2900  		if (rf->channel == 6)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2901  			rt2800_bbp_write(rt2x00dev, 68, 0x0c);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2902  		else
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2903  			rt2800_bbp_write(rt2x00dev, 68, 0x0b);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2904  
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2905  		if (rf->channel >= 1 && rf->channel <= 6)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2906  			rt2800_bbp_write(rt2x00dev, 59, 0x0f);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2907  		else if (rf->channel >= 7 && rf->channel <= 11)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2908  			rt2800_bbp_write(rt2x00dev, 59, 0x0e);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2909  		else if (rf->channel >= 12 && rf->channel <= 14)
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2910  			rt2800_bbp_write(rt2x00dev, 59, 0x0d);
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2911  	}
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2912  }
a89534eda drivers/net/wireless/rt2x00/rt2800lib.c        Woody Hung        2012-06-13  2913  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2914  static void rt2800_config_channel_rf3322(struct rt2x00_dev *rt2x00dev,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2915  					 struct ieee80211_conf *conf,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2916  					 struct rf_channel *rf,
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2917  					 struct channel_info *info)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2918  {
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2919  	u8 rfcsr;
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2920  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2921  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2922  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2923  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2924  	rt2800_rfcsr_write(rt2x00dev, 11, 0x42);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2925  	rt2800_rfcsr_write(rt2x00dev, 12, 0x1c);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2926  	rt2800_rfcsr_write(rt2x00dev, 13, 0x00);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2927  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2928  	if (info->default_power1 > POWER_BOUND)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2929  		rt2800_rfcsr_write(rt2x00dev, 47, POWER_BOUND);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2930  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2931  		rt2800_rfcsr_write(rt2x00dev, 47, info->default_power1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2932  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2933  	if (info->default_power2 > POWER_BOUND)
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2934  		rt2800_rfcsr_write(rt2x00dev, 48, POWER_BOUND);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2935  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2936  		rt2800_rfcsr_write(rt2x00dev, 48, info->default_power2);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2937  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  2938  	rt2800_freq_cal_mode1(rt2x00dev);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2939  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2940  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2941  	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2942  	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2943  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2944  	if ( rt2x00dev->default_ant.tx_chain_num == 2 )
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2945  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2946  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2947  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2948  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2949  	if ( rt2x00dev->default_ant.rx_chain_num == 2 )
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2950  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2951  	else
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2952  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2953  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2954  	rt2x00_set_field8(&rfcsr, RFCSR1_RX2_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2955  	rt2x00_set_field8(&rfcsr, RFCSR1_TX2_PD, 0);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2956  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2957  	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2958  
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2959  	rt2800_rfcsr_write(rt2x00dev, 31, 80);
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2960  }
038399515 drivers/net/wireless/rt2x00/rt2800lib.c        Daniel Golle      2012-09-09  2961  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2962  static void rt2800_config_channel_rf53xx(struct rt2x00_dev *rt2x00dev,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2963  					 struct ieee80211_conf *conf,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2964  					 struct rf_channel *rf,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2965  					 struct channel_info *info)
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2966  {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2967  	u8 rfcsr;
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2968  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2969  	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2970  	rt2800_rfcsr_write(rt2x00dev, 9, rf->rf3);
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2971  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 11);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2972  	rt2x00_set_field8(&rfcsr, RFCSR11_R, rf->rf2);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2973  	rt2800_rfcsr_write(rt2x00dev, 11, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2974  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2975  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 49);
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2976  	if (info->default_power1 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2977  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, POWER_BOUND);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2978  	else
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2979  		rt2x00_set_field8(&rfcsr, RFCSR49_TX, info->default_power1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2980  	rt2800_rfcsr_write(rt2x00dev, 49, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2981  
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2982  	if (rt2x00_rt(rt2x00dev, RT5392)) {
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2983  		rfcsr = rt2800_rfcsr_read(rt2x00dev, 50);
6264995f8 drivers/net/wireless/rt2x00/rt2800lib.c        Felipe Pena       2013-10-18  2984  		if (info->default_power2 > POWER_BOUND)
7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.c        Stanislaw Gruszka 2012-07-09  2985  			rt2x00_set_field8(&rfcsr, RFCSR50_TX, POWER_BOUND);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2986  		else
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2987  			rt2x00_set_field8(&rfcsr, RFCSR50_TX,
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2988  					  info->default_power2);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2989  		rt2800_rfcsr_write(rt2x00dev, 50, rfcsr);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2990  	}
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2991  
16d571bb0 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Arnd Bergmann     2017-05-17  2992  	rfcsr = rt2800_rfcsr_read(rt2x00dev, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2993  	if (rt2x00_rt(rt2x00dev, RT5392)) {
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2994  		rt2x00_set_field8(&rfcsr, RFCSR1_RX1_PD, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2995  		rt2x00_set_field8(&rfcsr, RFCSR1_TX1_PD, 1);
cff3d1f09 drivers/net/wireless/rt2x00/rt2800lib.c        Zero.Lin          2012-05-29  2996  	}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2997  	rt2x00_set_field8(&rfcsr, RFCSR1_RF_BLOCK_EN, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2998  	rt2x00_set_field8(&rfcsr, RFCSR1_PLL_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  2999  	rt2x00_set_field8(&rfcsr, RFCSR1_RX0_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3000  	rt2x00_set_field8(&rfcsr, RFCSR1_TX0_PD, 1);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3001  	rt2800_rfcsr_write(rt2x00dev, 1, rfcsr);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3002  
884525411 drivers/net/wireless/ralink/rt2x00/rt2800lib.c Stanislaw Gruszka 2016-12-19  3003  	rt2800_freq_cal_mode1(rt2x00dev);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3004  
c429dfef7 drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2013-10-11  3005  	if (rt2x00_has_cap_bt_coexist(rt2x00dev)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3006  		if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3007  			/* r55/r59 value array of channel 1~14 */
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3008  			static const char r55_bt_rev[] = {0x83, 0x83,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3009  				0x83, 0x73, 0x73, 0x63, 0x53, 0x53,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3010  				0x53, 0x43, 0x43, 0x43, 0x43, 0x43};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3011  			static const char r59_bt_rev[] = {0x0e, 0x0e,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3012  				0x0e, 0x0e, 0x0e, 0x0b, 0x0a, 0x09,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3013  				0x07, 0x07, 0x07, 0x07, 0x07, 0x07};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3014  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3015  			rt2800_rfcsr_write(rt2x00dev, 55,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03 @3016  					   r55_bt_rev[idx]);
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3017  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3018  					   r59_bt_rev[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3019  		} else {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3020  			static const char r59_bt[] = {0x8b, 0x8b, 0x8b,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3021  				0x8b, 0x8b, 0x8b, 0x8b, 0x8a, 0x89,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3022  				0x88, 0x88, 0x86, 0x85, 0x84};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3023  
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3024  			rt2800_rfcsr_write(rt2x00dev, 59, r59_bt[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3025  		}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3026  	} else {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3027  		if (rt2x00_rt_rev_gte(rt2x00dev, RT5390, REV_RT5390F)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3028  			static const char r55_nonbt_rev[] = {0x23, 0x23,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3029  				0x23, 0x23, 0x13, 0x13, 0x03, 0x03,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3030  				0x03, 0x03, 0x03, 0x03, 0x03, 0x03};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3031  			static const char r59_nonbt_rev[] = {0x07, 0x07,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3032  				0x07, 0x07, 0x07, 0x07, 0x07, 0x07,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3033  				0x07, 0x07, 0x06, 0x05, 0x04, 0x04};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3034  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3035  			rt2800_rfcsr_write(rt2x00dev, 55,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3036  					   r55_nonbt_rev[idx]);
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3037  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3038  					   r59_nonbt_rev[idx]);
2ed718844 drivers/net/wireless/rt2x00/rt2800lib.c        John Li           2012-02-17  3039  		} else if (rt2x00_rt(rt2x00dev, RT5390) ||
41977e86c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Roman Yeryomin    2017-03-21  3040  			   rt2x00_rt(rt2x00dev, RT5392) ||
41977e86c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Roman Yeryomin    2017-03-21  3041  			   rt2x00_rt(rt2x00dev, RT6352)) {
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3042  			static const char r59_non_bt[] = {0x8f, 0x8f,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3043  				0x8f, 0x8f, 0x8f, 0x8f, 0x8f, 0x8d,
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3044  				0x8a, 0x88, 0x88, 0x87, 0x87, 0x86};
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3045  
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3046  			rt2800_rfcsr_write(rt2x00dev, 59,
adde5882b drivers/net/wireless/rt2x00/rt2800lib.c        Gabor Juhos       2011-03-03  3047  					   r59_non_bt[idx]);
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3048  		} else if (rt2x00_rt(rt2x00dev, RT5350)) {
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3049  			static const char r59_non_bt[] = {0x0b, 0x0b,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3050  				0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0a,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3051  				0x0a, 0x09, 0x08, 0x07, 0x07, 0x06};
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3052  
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3053  			rt2800_rfcsr_write(rt2x00dev, 59,
98e71f44c drivers/net/wireless/ralink/rt2x00/rt2800lib.c Serge Vasilugin   2017-01-20  3054  					   r59_non_bt[idx]);
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3055  		}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3056  	}
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3057  }
60687ba71 drivers/net/wireless/rt2x00/rt2800lib.c        RA-Shiang Tu      2011-02-20  3058  

:::::: The code at line 3016 was first introduced by commit
:::::: adde5882bc6c21de7ee80ee15dfd58c7e9a472ac rt2x00: fix whitespace damage in the rt2800 specific code

:::::: TO: Gabor Juhos <juhosg@openwrt.org>
:::::: CC: John W. Linville <linville@tuxdriver.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 9e7b8933d30c..878fbca60f40 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -2878,6 +2878,7 @@  static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev,
 					 struct rf_channel *rf,
 					 struct channel_info *info)
 {
+	int idx = rf->channel-1;
 	u8 rfcsr;
 
 	rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1);
@@ -3001,60 +3002,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]);
 		}
 	}
 }

[v2,1/4] rt2x00: remove unneeded check

Commit Message

Comments

Patch