From 2b1351a30705925ed06b41ec98a6fbaad4ba4d6f Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Fri, 21 Jan 2011 12:19:52 +0900 Subject: [PATCH] ath5k: Simplify loop when setting up channels Simplify confusing code and get rid of an unnecessary variable. Signed-off-by: Bruno Randolf Signed-off-by: John W. Linville --- drivers/net/wireless/ath/ath5k/base.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 217c2a09d97..76a4e55265c 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -267,7 +267,7 @@ ath5k_setup_channels(struct ath5k_hw *ah, unsigned int mode, unsigned int max) { - unsigned int i, count, size, chfreq, freq, ch; + unsigned int count, size, chfreq, freq, ch; enum ieee80211_band band; if (!test_bit(mode, ah->ah_modes)) @@ -291,8 +291,8 @@ ath5k_setup_channels(struct ath5k_hw *ah, return 0; } - for (i = 0, count = 0; i < size && max > 0; i++) { - ch = i + 1 ; + count = 0; + for (ch = 1; ch <= size && count < max; ch++) { freq = ieee80211_channel_to_frequency(ch, band); if (freq == 0) /* mapping failed - not a standard channel */ @@ -319,7 +319,6 @@ ath5k_setup_channels(struct ath5k_hw *ah, } count++; - max--; } return count;