[PATCH 7/8] staging: ks7010: Refactor after indentation removal

["Tobin C. Harding" <me@xxxxxxxx>]

Code is able to be refactored after previous removal of levels of
indentation.

Refactor code to bring it more inline with kernel standards.

Signed-off-by: Tobin C. Harding <me@xxxxxxxx>
---
 drivers/staging/ks7010/ks_hostif.c | 53 ++++++++++++++------------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/drivers/staging/ks7010/ks_hostif.c b/drivers/staging/ks7010/ks_hostif.c
index d479a88..ca1051ff 100644
--- a/drivers/staging/ks7010/ks_hostif.c
+++ b/drivers/staging/ks7010/ks_hostif.c
@@ -424,7 +424,7 @@ static int function_needs_naming(struct ks_wlan_private *priv,
 		return -ERROR;
 	}
 
-	auth_type = get_WORD(priv);	/* AuthType */
+	auth_type = get_WORD(priv); /* AuthType */
 	eth_proto = ntohs(eth_hdr->h_proto);
 
 	cond = ((auth_type == TYPE_PMK1 && priv->wpa.pairwise_suite == IW_AUTH_CIPHER_TKIP) ||
@@ -433,26 +433,25 @@ static int function_needs_naming(struct ks_wlan_private *priv,
 
 	if (!cond || !priv->wpa.key[auth_type - 1].key_len)
 		return 0;
-	
-	DPRINTK(4, "TKIP: protocol=%04X: size=%u\n",
-		eth_proto, priv->rx_size);
+
+	DPRINTK(4, "TKIP: protocol=%04X: size=%u\n", eth_proto, priv->rx_size);
+
 	/* MIC save */
-	memcpy(&RecvMIC[0],
-		(priv->rxp) + ((priv->rx_size) - 8), 8);
+	memcpy(&RecvMIC[0], (priv->rxp) + ((priv->rx_size) - 8), 8);
 	priv->rx_size = priv->rx_size - 8;
-	if (auth_type > 0 && auth_type < 4) {	/* auth_type check */
-		MichaelMICFunction(&michel_mic, (uint8_t *) priv->wpa.key[auth_type - 1].rx_mic_key, (uint8_t *) priv->rxp, (int)priv->rx_size, (uint8_t) 0,	/* priority */
-				(uint8_t *)
-				michel_mic.Result);
+	if (auth_type > 0 && auth_type < 4) { /* auth_type check */
+		MichaelMICFunction(&michel_mic,
+				  (uint8_t *) priv->wpa.key[auth_type - 1].rx_mic_key,
+				  (uint8_t *) priv->rxp, (int)priv->rx_size,
+				  (uint8_t) 0, /* priority */
+				  (uint8_t *)michel_mic.Result);
 	}
 	if (memcmp(michel_mic.Result, RecvMIC, 8)) {
 		now = jiffies;
 		mic_failure = &priv->wpa.mic_failure;
 		/* MIC FAILURE */
 		if (mic_failure->last_failure_time &&
-			(now -
-				mic_failure->last_failure_time) /
-			HZ >= 60) {
+		   (now - mic_failure->last_failure_time) / HZ >= 60) {
 			mic_failure->failure = 0;
 		}
 		DPRINTK(4, "MIC FAILURE\n");
@@ -461,32 +460,20 @@ static int function_needs_naming(struct ks_wlan_private *priv,
 			mic_failure->counter = 0;
 		} else if (mic_failure->failure == 1) {
 			mic_failure->failure = 2;
-			mic_failure->counter =
-				(uint16_t) ((now -
-						mic_failure->
-						last_failure_time)
-					/ HZ);
+			mic_failure->counter = (uint16_t)((now - mic_failure->last_failure_time) / HZ);
 			if (!mic_failure->counter)	/* mic_failure counter value range 1-60 */
-				mic_failure->counter =
-					1;
+				mic_failure->counter = 1;
 		}
-		priv->wpa.mic_failure.
-			last_failure_time = now;
+		priv->wpa.mic_failure.last_failure_time = now;
+
 		/*  needed parameters: count, keyid, key type, TSC */
-		sprintf(buf,
-			"MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr="
-			"%pM)",
+		sprintf(buf, "MLME-MICHAELMICFAILURE.indication(keyid=%d %scast addr=%pM)",
 			auth_type - 1,
-			eth_hdr->
-			h_dest[0] & 0x01 ? "broad" :
-			"uni", eth_hdr->h_source);
+			eth_hdr->h_dest[0] & 0x01 ? "broad" : "uni", eth_hdr->h_source);
 		memset(&wrqu, 0, sizeof(wrqu));
 		wrqu.data.length = strlen(buf);
-		DPRINTK(4,
-			"IWEVENT:MICHAELMICFAILURE\n");
-		wireless_send_event(priv->net_dev,
-				IWEVCUSTOM, &wrqu,
-				buf);
+		DPRINTK(4, "IWEVENT:MICHAELMICFAILURE\n");
+		wireless_send_event(priv->net_dev, IWEVCUSTOM, &wrqu, buf);
 		return -ERROR;
 	}
 	return 0;
-- 
2.7.4

_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel