Skip to contentSkip to conversation

stating: otus: fix compile warning and some style issues

PATCH In review Roberto Rodriguez Alkala 2 participants 2 messages Aug 7, 2010 – Aug 8, 2010

Subsystems (2)
Staging Kernel janitors
lore
Share & tools
lore

Roberto Rodriguez Alkala

author
#0 lore raw

PATCH 1/1 stating: otus: fix compile warning and some style issues

In today linux-next I got a compile warning in staging/otus driver. This patch solves the issue and also improves the coding style.

Signed-off-by Roberto Rodriguez Alcala <[email protected]>
---
 drivers/staging/otus/80211core/ratectrl.c |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)
drivers/staging/otus/80211core/ratectrl.c +9 -17
index a1abe2f..283b2b5 100644
@@ -422,23 +422,15 @@ u8_t zfRateCtrlRateDiff(struct zsRcCell* rcCell, u8_t retryRate)
     u16_t i;
 
     /* Find retryRate in operationRateSet[] */
-    for (i=0; i<rcCell->operationRateCount; i++)
-    {
-        if (retryRate = rcCell->operationRateSet[i])
-        {
-            if (i < rcCell->currentRateIndex)
-            {
-                return ((rcCell->currentRateIndex - i)+1)>>1;
-            }
-            else if (i = rcCell->currentRateIndex = 0)
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
+    for (i = 0; i < rcCell->operationRateCount; i++) {
+	if (retryRate = rcCell->operationRateSet[i]) {
+		if (i < rcCell->currentRateIndex)
+			return ((rcCell->currentRateIndex - i)+1)>>1;
+		else if (i = rcCell->currentRateIndex && i = 0)
+			return 1;
+		else
+			return 0;
+	}
     }
     /* TODO : retry rate not in operation rate set */
     zm_msg1_tx(ZM_LV_0, "Not in operation rate set:", retryRate);
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 35 lines · Roberto Rodriguez Alkala

In today linux-next I got a compile warning in staging/otus driver. This patch solves the issue and also improves the coding style.

Signed-off-by Roberto Rodriguez Alcala <[email protected]>
---
 drivers/staging/otus/80211core/ratectrl.c |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)
drivers/staging/otus/80211core/ratectrl.c +2 -17
index a1abe2f..283b2b5 100644
@@ -422,23 +422,15 @@ u8_t zfRateCtrlRateDiff(struct zsRcCell* rcCell, u8_t retryRate)
     u16_t i;
 
     /* Find retryRate in operationRateSet[] */
-    for (i=0; i<rcCell->operationRateCount; i++)
-    {
-        if (retryRate = rcCell->operationRateSet[i])
-        {
-            if (i < rcCell->currentRateIndex)
-            {
-                return ((rcCell->currentRateIndex - i)+1)>>1;
-            }
-            else if (i = rcCell->currentRateIndex = 0)
-            {
-                return 1;
-            }
-            else
-            {
-                return 0;
-            }
-        }
+    for (i = 0; i < rcCell->operationRateCount; i++) {
+	if (retryRate = rcCell->operationRateSet[i]) {

drivers/staging/otus/80211core/ratectrl.c u8_t zfRateCtrlRateDiff(struct zsRcCell* rcCell, u8_t retryRate) · line 436

Quoted 10 lines
drivers/staging/otus/80211core/ratectrl.c +7 -0
+		if (i < rcCell->currentRateIndex)
+			return ((rcCell->currentRateIndex - i)+1)>>1;
+		else if (i = rcCell->currentRateIndex && i = 0)
+			return 1;
+		else
+			return 0;
+	}
     }
     /* TODO : retry rate not in operation rate set */
     zm_msg1_tx(ZM_LV_0, "Not in operation rate set:", retryRate);

mmh, it is a matter of taste but to improve readablity
i would make the special case i=0 first and let the loop
start with i=1. /* untested code below, assuming rcCell->currentRateIndex>=0 */

if ( retryRate = rcCell->operationRateSet[0] && rcCell->currentRateIndex= 0 )

	return 1;
  for (i = 1; i < rcCell->operationRateCount; i++) {
               if (i < rcCell->currentRateIndex)
                  return ((rcCell->currentRateIndex - i)+1)>>1;
               else
                  return 0;
   }

just my 2 cents,

re,
wh