Browse Source

ath9k: remove repetitions of mask array size

The constant "123", which is the number of elements in
mask_m / mask_p, is repeated several times in this function.

Replace memsets with array initialization, and replace a loop
conditional with ARRAY_SIZE() so that we don't repeat ourselves.

Signed-off-by: Bob Copeland <me@bobcopeland.com>
Reviewed-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Bob Copeland 9 years ago
parent
commit
b5182e157d
1 changed files with 3 additions and 6 deletions
  1. 3 6
      drivers/net/wireless/ath/ath9k/ar5008_phy.c

+ 3 - 6
drivers/net/wireless/ath/ath9k/ar5008_phy.c

@@ -260,8 +260,8 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
 	int cur_bin;
 	int cur_bin;
 	int upper, lower, cur_vit_mask;
 	int upper, lower, cur_vit_mask;
 	int i;
 	int i;
-	int8_t mask_m[123];
-	int8_t mask_p[123];
+	int8_t mask_m[123] = {0};
+	int8_t mask_p[123] = {0};
 	int8_t mask_amt;
 	int8_t mask_amt;
 	int tmp_mask;
 	int tmp_mask;
 	static const int pilot_mask_reg[4] = {
 	static const int pilot_mask_reg[4] = {
@@ -274,9 +274,6 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
 	};
 	};
 	static const int inc[4] = { 0, 100, 0, 0 };
 	static const int inc[4] = { 0, 100, 0, 0 };
 
 
-	memset(&mask_m, 0, sizeof(int8_t) * 123);
-	memset(&mask_p, 0, sizeof(int8_t) * 123);
-
 	cur_bin = -6000;
 	cur_bin = -6000;
 	upper = bin + 100;
 	upper = bin + 100;
 	lower = bin - 100;
 	lower = bin - 100;
@@ -302,7 +299,7 @@ void ar5008_hw_cmn_spur_mitigate(struct ath_hw *ah,
 	upper = bin + 120;
 	upper = bin + 120;
 	lower = bin - 120;
 	lower = bin - 120;
 
 
-	for (i = 0; i < 123; i++) {
+	for (i = 0; i < ARRAY_SIZE(mask_m); i++) {
 		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
 		if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) {
 			/* workaround for gcc bug #37014 */
 			/* workaround for gcc bug #37014 */
 			volatile int tmp_v = abs(cur_vit_mask - bin);
 			volatile int tmp_v = abs(cur_vit_mask - bin);