openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ks7010: move check and break to top of loop 

Function uses an if statement within a for loop to guard a block of
code. If 'if' statement conditional evaluates to false, loop breaks. The
same logic can be expressed by inverting the conditional and breaking
when new conditional evaluates to true. This allows the subsequent code
to be indented one level less, aiding readability. Reduced indentation
also allows for the code to be laid out more clearly and fixes two
checkpatch warnings.

Invert if statement conditional, break from for loop if new
conditional evaluates to true. Reduce indentation in subsequent code,
fix whitespace issues. Do not change program logic.

Signed-off-by: Tobin C. Harding <me@tobin.cc>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobin C. Harding 2017-04-10 13:16:01 +10:00 committed by Greg Kroah-Hartman
parent eb8c4e5469
commit d317d054b1
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/ks7010/ks_hostif.c
View File

@ -2147,33 +2147,27 @@ void hostif_sme_mode_setup(struct ks_wlan_private *priv)
/* rate mask by phy setting */
if (priv->reg.phy_type == D_11B_ONLY_MODE) {
for (i = 0; i < priv->reg.rate_set.size; i++) {
if (IS_11B_RATE(priv->reg.rate_set.body[i])) {
if ((priv->reg.rate_set.body[i] & RATE_MASK) >=
TX_RATE_5M)
rate_octet[i] =
priv->reg.rate_set.
body[i] & RATE_MASK;
else
rate_octet[i] =
priv->reg.rate_set.body[i];
} else {
if (!IS_11B_RATE(priv->reg.rate_set.body[i]))
break;
if ((priv->reg.rate_set.body[i] & RATE_MASK) >= TX_RATE_5M) {
rate_octet[i] = priv->reg.rate_set.body[i] &
RATE_MASK;
} else {
rate_octet[i] = priv->reg.rate_set.body[i];
}
}
} else { /* D_11G_ONLY_MODE or D_11BG_COMPATIBLE_MODE */
for (i = 0; i < priv->reg.rate_set.size; i++) {
if (IS_11BG_RATE(priv->reg.rate_set.body[i])) {
if (IS_OFDM_EXT_RATE
(priv->reg.rate_set.body[i]))
rate_octet[i] =
priv->reg.rate_set.
body[i] & RATE_MASK;
else
rate_octet[i] =
priv->reg.rate_set.body[i];
} else {
if (!IS_11BG_RATE(priv->reg.rate_set.body[i]))
break;
if (IS_OFDM_EXT_RATE(priv->reg.rate_set.body[i])) {
rate_octet[i] = priv->reg.rate_set.body[i] &
RATE_MASK;
} else {
rate_octet[i] = priv->reg.rate_set.body[i];
}
}
}