Skip to contentSkip to conversation

Staging: ks7010: ks_*: Braces should be used on all arms of these statements

PATCH In review Shiva Kerdel 2 participants 3 messages Feb 17, 2017 – Feb 18, 2017 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: ks7010: ks_*: Braces should be used on all arms of these statements

Braces should be used on all arms of these statements (CHECK)..

---
 drivers/staging/ks7010/ks_hostif.c   |  6 ++++--
 drivers/staging/ks7010/ks_wlan_net.c | 42 +++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 17 deletions(-)
drivers/staging/ks7010/ks_hostif.c +4 -2
index 97d7b56c592a..fad1cf5361b0 100644
@@ -2148,8 +2148,9 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
 				else
 					rate_octet[i] =
 					    priv->reg.rate_set.body[i];
-			} else
+			} else {
 				break;
+			}
 		}
 
 	} else {	/* D_11G_ONLY_MODE or D_11BG_COMPATIBLE_MODE */
@@ -2163,8 +2164,9 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
 				else
 					rate_octet[i] =
 					    priv->reg.rate_set.body[i];
-			} else
+			} else {
 				break;
+			}
 		}
 	}
 	rate_size = i;
drivers/staging/ks7010/ks_wlan_net.c +27 -15

128 lines not on this page · raw message

Signature · 1 line
2.11.1
#1 lore raw
Quoted 1 line · Shiva Kerdel

Braces should be used on all arms of these statements (CHECK)..

[]

drivers/staging/ks7010/ks_hostif.c

Quoted 1 line
drivers/staging/ks7010/ks_hostif.c +0 -0

[]

drivers/staging/ks7010/ks_hostif.c void hostif_sme_mode_setup(struct ks_wlan_private *priv) · line 2153

Quoted 8 lines
drivers/staging/ks7010/ks_hostif.c +2 -1
@@ -2148,8 +2148,9 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
 				else
 					rate_octet[i] =
 					    priv->reg.rate_set.body[i];
-			} else
+			} else {
 				break;
+			}

Generally, any time you see a form like this,
the test should be reversed

	for/while/do {
		if (foo) {
			[bar...]
		} else {
			break;
		}

should be:

	for/while/do {
		if (!foo)
			break;
		[bar...]
	}
#2 lore raw
Quoted 26 lines · Joe Perches
Quoted 1 line · Shiva Kerdel

Braces should be used on all arms of these statements (CHECK)..

[]

drivers/staging/ks7010/ks_hostif.c

Quoted 1 line
drivers/staging/ks7010/ks_hostif.c +0 -0

[]

drivers/staging/ks7010/ks_hostif.c void hostif_sme_mode_setup(struct ks_wlan_private *priv) · line 2153

Quoted 8 lines
drivers/staging/ks7010/ks_hostif.c +2 -1
@@ -2148,8 +2148,9 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
 				else
 					rate_octet[i] =
 					    priv->reg.rate_set.body[i];
-			} else
+			} else {
 				break;
+			}

Generally, any time you see a form like this,
the test should be reversed

	for/while/do {
		if (foo) {
			[bar...]
		} else {
			break;
		}
Quoted 7 lines

should be:

	for/while/do {
		if (!foo)
			break;
		[bar...]
	}

btw: the code would read better using

     a temporary. Something like:

	if (priv->reg.phy_type == D_11B_ONLY_MODE) {
		for (i = 0; i < priv->reg.rate_set.size; i++) {
			u8 rate = priv->reg.rate_set.body[i];

			if (!IS_11B_RATE(rate))
				break;
			rate_octet[i] = ((rate & RATE_MASK) >= TX_RATE_5M)
				? (rate & RATE_MASK) : rate;
		}