Skip to content

L
linux
Commit 223c5a87 authored by Gabor Juhos's avatar Gabor Juhos Committed by John W. Linville
Browse files
Options

ath9k: remove superfluous parentheses 

Also remove two empty lines.
Signed-off-by: default avatarGabor Juhos <juhosg@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cd0ed1b5
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 32 deletions
drivers/net/wireless/ath/ath9k/recv.c
View file @ 223c5a87
...@@ -1076,39 +1076,39 @@ static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb, ...@@ -1076,39 +1076,39 @@ static void ath_lnaconf_alt_good_scan(struct ath_ant_comb *antcomb,
antcomb->rssi_lna1 = main_rssi_avg; antcomb->rssi_lna1 = main_rssi_avg;
switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) { switch ((ant_conf.main_lna_conf << 4) | ant_conf.alt_lna_conf) {
case (0x10): /* LNA2 A-B */ case 0x10: /* LNA2 A-B */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1; antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
break; break;
case (0x20): /* LNA1 A-B */ case 0x20: /* LNA1 A-B */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2; antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA2;
break; break;
case (0x21): /* LNA1 LNA2 */ case 0x21: /* LNA1 LNA2 */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA2;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
antcomb->second_quick_scan_conf = antcomb->second_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
break; break;
case (0x12): /* LNA2 LNA1 */ case 0x12: /* LNA2 LNA1 */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
antcomb->second_quick_scan_conf = antcomb->second_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
break; break;
case (0x13): /* LNA2 A+B */ case 0x13: /* LNA2 A+B */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1; antcomb->second_quick_scan_conf = ATH_ANT_DIV_COMB_LNA1;
break; break;
case (0x23): /* LNA1 A+B */ case 0x23: /* LNA1 A+B */
antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2; antcomb->main_conf = ATH_ANT_DIV_COMB_LNA1_PLUS_LNA2;
antcomb->first_quick_scan_conf = antcomb->first_quick_scan_conf =
ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2; ATH_ANT_DIV_COMB_LNA1_MINUS_LNA2;
...@@ -1325,40 +1325,40 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1325,40 +1325,40 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
/* Adjust the fast_div_bias based on main and alt lna conf */ /* Adjust the fast_div_bias based on main and alt lna conf */
switch ((ant_conf->main_lna_conf << 4) | switch ((ant_conf->main_lna_conf << 4) |
ant_conf->alt_lna_conf) { ant_conf->alt_lna_conf) {
case (0x01): /* A-B LNA2 */ case 0x01: /* A-B LNA2 */
ant_conf->fast_div_bias = 0x3b; ant_conf->fast_div_bias = 0x3b;
break; break;
case (0x02): /* A-B LNA1 */ case 0x02: /* A-B LNA1 */
ant_conf->fast_div_bias = 0x3d; ant_conf->fast_div_bias = 0x3d;
break; break;
case (0x03): /* A-B A+B */ case 0x03: /* A-B A+B */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
break; break;
case (0x10): /* LNA2 A-B */ case 0x10: /* LNA2 A-B */
ant_conf->fast_div_bias = 0x7; ant_conf->fast_div_bias = 0x7;
break; break;
case (0x12): /* LNA2 LNA1 */ case 0x12: /* LNA2 LNA1 */
ant_conf->fast_div_bias = 0x2; ant_conf->fast_div_bias = 0x2;
break; break;
case (0x13): /* LNA2 A+B */ case 0x13: /* LNA2 A+B */
ant_conf->fast_div_bias = 0x7; ant_conf->fast_div_bias = 0x7;
break; break;
case (0x20): /* LNA1 A-B */ case 0x20: /* LNA1 A-B */
ant_conf->fast_div_bias = 0x6; ant_conf->fast_div_bias = 0x6;
break; break;
case (0x21): /* LNA1 LNA2 */ case 0x21: /* LNA1 LNA2 */
ant_conf->fast_div_bias = 0x0; ant_conf->fast_div_bias = 0x0;
break; break;
case (0x23): /* LNA1 A+B */ case 0x23: /* LNA1 A+B */
ant_conf->fast_div_bias = 0x6; ant_conf->fast_div_bias = 0x6;
break; break;
case (0x30): /* A+B A-B */ case 0x30: /* A+B A-B */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
break; break;
case (0x31): /* A+B LNA2 */ case 0x31: /* A+B LNA2 */
ant_conf->fast_div_bias = 0x3b; ant_conf->fast_div_bias = 0x3b;
break; break;
case (0x32): /* A+B LNA1 */ case 0x32: /* A+B LNA1 */
ant_conf->fast_div_bias = 0x3d; ant_conf->fast_div_bias = 0x3d;
break; break;
default: default:
...@@ -1368,22 +1368,22 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1368,22 +1368,22 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
/* Adjust the fast_div_bias based on main and alt_lna_conf */ /* Adjust the fast_div_bias based on main and alt_lna_conf */
switch ((ant_conf->main_lna_conf << 4) | switch ((ant_conf->main_lna_conf << 4) |
ant_conf->alt_lna_conf) { ant_conf->alt_lna_conf) {
case (0x01): /* A-B LNA2 */ case 0x01: /* A-B LNA2 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x02): /* A-B LNA1 */ case 0x02: /* A-B LNA1 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x03): /* A-B A+B */ case 0x03: /* A-B A+B */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x10): /* LNA2 A-B */ case 0x10: /* LNA2 A-B */
if (!(antcomb->scan) && if (!(antcomb->scan) &&
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
...@@ -1392,12 +1392,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1392,12 +1392,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x12): /* LNA2 LNA1 */ case 0x12: /* LNA2 LNA1 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x13): /* LNA2 A+B */ case 0x13: /* LNA2 A+B */
if (!(antcomb->scan) && if (!(antcomb->scan) &&
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
...@@ -1406,7 +1406,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1406,7 +1406,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x20): /* LNA1 A-B */ case 0x20: /* LNA1 A-B */
if (!(antcomb->scan) && if (!(antcomb->scan) &&
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
...@@ -1415,12 +1415,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1415,12 +1415,12 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x21): /* LNA1 LNA2 */ case 0x21: /* LNA1 LNA2 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x23): /* LNA1 A+B */ case 0x23: /* LNA1 A+B */
if (!(antcomb->scan) && if (!(antcomb->scan) &&
(alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO)) (alt_ratio > ATH_ANT_DIV_COMB_ALT_ANT_RATIO))
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
...@@ -1429,17 +1429,17 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1429,17 +1429,17 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x30): /* A+B A-B */ case 0x30: /* A+B A-B */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x31): /* A+B LNA2 */ case 0x31: /* A+B LNA2 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
break; break;
case (0x32): /* A+B LNA1 */ case 0x32: /* A+B LNA1 */
ant_conf->fast_div_bias = 0x1; ant_conf->fast_div_bias = 0x1;
ant_conf->main_gaintb = 0; ant_conf->main_gaintb = 0;
ant_conf->alt_gaintb = 0; ant_conf->alt_gaintb = 0;
...@@ -1447,9 +1447,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf, ...@@ -1447,9 +1447,7 @@ static void ath_ant_div_conf_fast_divbias(struct ath_hw_antcomb_conf *ant_conf,
default: default:
break; break;
} }
} }
} }
/* Antenna diversity and combining */ /* Antenna diversity and combining */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7