Re: [PATCH v2 1/4] rt2x00: remove unneeded check
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.cStanislaw Gruszka 2013-03-16 2875 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2876 static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2877 struct ieee80211_conf *conf, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2878 struct rf_channel *rf, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2879 struct channel_info *info) a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2882 u8 rfcsr; a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2883 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2884 rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2887 rt2x00_set_field8(, RFCSR11_R, rf->rf2); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2888 rt2800_rfcsr_write(rt2x00dev, 11, rfcsr); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cStanislaw Gruszka 2012-07-09 2891 if (info->default_power1 > POWER_BOUND) 7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.cStanislaw Gruszka 2012-07-09 2892 rt2x00_set_field8(, RFCSR49_TX, POWER_BOUND); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2893 else a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2894 rt2x00_set_field8(, RFCSR49_TX, info->default_power1); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2895 rt2800_rfcsr_write(rt2x00dev, 49, rfcsr); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2898 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2899 if (rf->channel <= 14) { a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2900 if (rf->channel == 6) a89534eda
Re: [PATCH v2 1/4] rt2x00: remove unneeded check
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.cStanislaw Gruszka 2013-03-16 2875 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2876 static void rt2800_config_channel_rf3290(struct rt2x00_dev *rt2x00dev, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2877 struct ieee80211_conf *conf, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2878 struct rf_channel *rf, a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2879 struct channel_info *info) a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2882 u8 rfcsr; a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2883 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2884 rt2800_rfcsr_write(rt2x00dev, 8, rf->rf1); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2887 rt2x00_set_field8(, RFCSR11_R, rf->rf2); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2888 rt2800_rfcsr_write(rt2x00dev, 11, rfcsr); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cStanislaw Gruszka 2012-07-09 2891 if (info->default_power1 > POWER_BOUND) 7573cb5b4 drivers/net/wireless/rt2x00/rt2800lib.cStanislaw Gruszka 2012-07-09 2892 rt2x00_set_field8(, RFCSR49_TX, POWER_BOUND); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2893 else a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2894 rt2x00_set_field8(, RFCSR49_TX, info->default_power1); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2895 rt2800_rfcsr_write(rt2x00dev, 49, rfcsr); a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody 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.cWoody Hung 2012-06-13 2898 a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2899 if (rf->channel <= 14) { a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2900 if (rf->channel == 6) a89534eda drivers/net/wireless/rt2x00/rt2800lib.cWoody Hung 2012-06-13 2901 rt2800_bbp_write(rt2x00dev, 68, 0x0c); a89534eda
[PATCH v2 1/4] rt2x00: remove unneeded check
From: Tomislav Požega Remove band check from rf53xx channel config routine since all chips using it are single band. Signed-off-by: Tomislav Požega --- drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 103 - 1 file changed, 50 insertions(+), 53 deletions(-) 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}; - -