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().

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 8d2277bb898fd3489b8ea39f42decdaa1b306200..dc221f2ad2278d2380564082a4cfda496482c5f7 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -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);