Skip to contentSkip to conversation

wlan-ng: clean up prism2sta_inf_chinforesults()

PATCH In review Dan Carpenter 2 participants 4 messages Feb 27, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 wlan-ng: clean up prism2sta_inf_chinforesults()

This function is ugly because it hits against the 80 character limit. This patch does several things to clean it up.

1) Introduces "result" instead of inf->info.chinforesult.result[n].
2) Reverses the ".scanchannels & (1 << i)" so everthing can be pulled in one indent level.
3) Use "chan" instead of "channel".
4) Tweaks the line breaks to the call to pr_debug().

drivers/staging/wlan-ng/prism2sta.c +24 -19
index 8d2277b..dc221f2 100644
@@ -1160,30 +1160,30 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,
 	    le16_to_cpu(inf->info.chinforesult.scanchannels);
 
 	for (i = 0, n = 0; i < HFA384x_CHINFORESULT_MAX; i++) {
-		if (hw->channel_info.results.scanchannels & (1 << i)) {
-			int channel -			    le16_to_cpu(inf->info.chinforesult.result[n].chid) -
-			    1;
-			hfa384x_ChInfoResultSub_t *chinforesult -			    &hw->channel_info.results.result[channel];
-			chinforesult->chid = channel;
-			chinforesult->anl -			    le16_to_cpu(inf->info.chinforesult.result[n].anl);
-			chinforesult->pnl -			    le16_to_cpu(inf->info.chinforesult.result[n].pnl);
-			chinforesult->active -			    le16_to_cpu(inf->info.chinforesult.result[n].
-					active);
-	pr_debug
-		("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
-			     channel + 1,
-			     chinforesult->
-			     active & HFA384x_CHINFORESULT_BSSACTIVE ? "signal"
-			     : "noise", chinforesult->anl, chinforesult->pnl,
-			     chinforesult->
-			     active & HFA384x_CHINFORESULT_PCFACTIVE ? 1 : 0);
-			n++;
-		}
+		hfa384x_ChInfoResultSub_t *result;
+		hfa384x_ChInfoResultSub_t *chinforesult;
+		int chan;
+
+		if (!(hw->channel_info.results.scanchannels & (1 << i)))
+			continue;
+
+		result = &inf->info.chinforesult.result[n];
+		chan = le16_to_cpu(result->chid) - 1;
+
+		chinforesult = &hw->channel_info.results.result[chan];
+		chinforesult->chid = chan;
+		chinforesult->anl = le16_to_cpu(result->anl);
+		chinforesult->pnl = le16_to_cpu(result->pnl);
+		chinforesult->active = le16_to_cpu(result->active);
+
+		pr_debug("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
+			 chan + 1,
+			 (chinforesult->active & HFA384x_CHINFORESULT_BSSACTIVE)
+				? "signal" : "noise",
+			 chinforesult->anl, chinforesult->pnl,
+			 (chinforesult->active & HFA384x_CHINFORESULT_PCFACTIVE)
+				? 1 : 0);
+		n++;
 	}
 	atomic_set(&hw->channel_info.done, 2);
 
#1 lore raw

Am 27.02.2013 06:12, schrieb Dan Carpenter:

Quoted 16 lines

This function is ugly because it hits against the 80 character limit. This patch does several things to clean it up.

1) Introduces "result" instead of inf->info.chinforesult.result[n].
2) Reverses the ".scanchannels & (1 << i)" so everthing can be pulled in one indent level.
3) Use "chan" instead of "channel".
4) Tweaks the line breaks to the call to pr_debug().

drivers/staging/wlan-ng/prism2sta.c +0 -0
index 8d2277b..dc221f2 100644

drivers/staging/wlan-ng/prism2sta.c static void prism2sta_inf_chinforesults(wlandevice_t *wlandev, · line 1162

Quoted 3 lines
drivers/staging/wlan-ng/prism2sta.c +0 -0
@@ -1160,30 +1160,30 @@ static void prism2sta_inf_chinforesults(wlandevice_t *wlandev,
 	    le16_to_cpu(inf->info.chinforesult.scanchannels);
 
 	for (i = 0, n = 0; i < HFA384x_CHINFORESULT_MAX; i++) {

would you mind to move the n=0 out of the for ? it has nothing (directly) todo with the loop. i found it confusing.

Quoted 35 lines
drivers/staging/wlan-ng/prism2sta.c +16 -19
-		if (hw->channel_info.results.scanchannels & (1 << i)) {
-			int channel > -			    le16_to_cpu(inf->info.chinforesult.result[n].chid) -
-			    1;
-			hfa384x_ChInfoResultSub_t *chinforesult > -			    &hw->channel_info.results.result[channel];
-			chinforesult->chid = channel;
-			chinforesult->anl > -			    le16_to_cpu(inf->info.chinforesult.result[n].anl);
-			chinforesult->pnl > -			    le16_to_cpu(inf->info.chinforesult.result[n].pnl);
-			chinforesult->active > -			    le16_to_cpu(inf->info.chinforesult.result[n].
-					active);
-	pr_debug
-		("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
-			     channel + 1,
-			     chinforesult->
-			     active & HFA384x_CHINFORESULT_BSSACTIVE ? "signal"
-			     : "noise", chinforesult->anl, chinforesult->pnl,
-			     chinforesult->
-			     active & HFA384x_CHINFORESULT_PCFACTIVE ? 1 : 0);
-			n++;
-		}
+		hfa384x_ChInfoResultSub_t *result;
+		hfa384x_ChInfoResultSub_t *chinforesult;
+		int chan;
+
+		if (!(hw->channel_info.results.scanchannels & (1 << i)))
+			continue;
+
+		result = &inf->info.chinforesult.result[n];
+		chan = le16_to_cpu(result->chid) - 1;
+
+		chinforesult = &hw->channel_info.results.result[chan];
+		chinforesult->chid = chan;
+		chinforesult->anl = le16_to_cpu(result->anl);
+		chinforesult->pnl = le16_to_cpu(result->pnl);
+		chinforesult->active = le16_to_cpu(result->active);
+

drivers/staging/wlan-ng/prism2sta.c static void prism2sta_inf_chinforesults(wlandevice_t *wlandev, · line 1188

Quoted 10 lines
drivers/staging/wlan-ng/prism2sta.c +8 -0
+		pr_debug("chinfo: channel %d, %s level (avg/peak)=%d/%d dB, pcf %d\n",
+			 chan + 1,
+			 (chinforesult->active & HFA384x_CHINFORESULT_BSSACTIVE)
+				? "signal" : "noise",
+			 chinforesult->anl, chinforesult->pnl,
+			 (chinforesult->active & HFA384x_CHINFORESULT_PCFACTIVE)
+				? 1 : 0);
+		n++;
 	}
 	atomic_set(&hw->channel_info.done, 2);

This is much better readable !

but i am missing the point why where are two counters.
i is simple. it is used to check the bitfield hw->channel_info.results.scanchannels n is increased only the when a bit is set. So it would be more easy to simply count the bits and run the loop about that number.
But i can also imagine that the bitfield act as "enable" and the author actualy should read &inf->info.chinforesult.result[i];

perhaps i am missing the point, could someone tell me were i am wrong ?

re,
wh

Quoted 7 lines
drivers/staging/wlan-ng/prism2sta.c +0 -1
--

To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Dan Carpenter
Quoted 9 lines · walter harms

but i am missing the point why where are two counters.
i is simple. it is used to check the bitfield hw->channel_info.results.scanchannels n is increased only the when a bit is set. So it would be more easy to simply count the bits and run the loop about that number.
But i can also imagine that the bitfield act as "enable" and the author actualy should read &inf->info.chinforesult.result[i];

perhaps i am missing the point, could someone tell me were i am wrong ?

I don't understand how you're confused. You've described the code perfectly. One is incremented for every iteration and one is only incremented if we find what we're looking for.

Anyway, the point of the cleanup was just so I could add a range check in patch 2/2 but the original code was too ugly to look at.

regards,
dan carpenter

#3 lore raw
In reply to Dan Carpenter
Quoted 9 lines · walter harms

but i am missing the point why where are two counters.
i is simple. it is used to check the bitfield hw->channel_info.results.scanchannels n is increased only the when a bit is set. So it would be more easy to simply count the bits and run the loop about that number.
But i can also imagine that the bitfield act as "enable" and the author actualy should read &inf->info.chinforesult.result[i];

perhaps i am missing the point, could someone tell me were i am wrong ?

Reading your email again, I can see what you mean.

I don't have the hardware though or any more info than you do. I can only assume that the original code works. My patch doesn't change anything or introduce any bugs that weren't there in the original.

regards,
dan carpenter