Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d317d054 authored by Tobin C. Harding's avatar Tobin C. Harding Committed by Greg Kroah-Hartman
Browse files

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: default avatarTobin C. Harding <me@tobin.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent eb8c4e54

drivers/staging/ks7010/ks_hostif.c

+14 −20
Original line number Diff line number Diff line
@@ -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];

			}

		}

	}