[PATCH 12/12] staging: ks7010: refactor, whitespace only

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Code may be refactored to take advantage of previous patches which
reduced the level of indentation. Function parameter line breaks can
be adjusted in line with kernel coding standards.

Refactor layout of function call parameters. Make whitespace changes
only.

Signed-off-by: Tobin C. Harding <me@xxxxxxxx>
---
 drivers/staging/ks7010/ks_wlan_net.c | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/drivers/staging/ks7010/ks_wlan_net.c b/drivers/staging/ks7010/ks_wlan_net.c
index ca46869..4d86d8a 100644
--- a/drivers/staging/ks7010/ks_wlan_net.c
+++ b/drivers/staging/ks7010/ks_wlan_net.c
@@ -2156,10 +2156,8 @@ static int ks_wlan_set_pmksa(struct net_device *dev,
 		list_for_each(ptr, &priv->pmklist.head) {
 			pmk = list_entry(ptr, struct pmk_t, list);
 			if (!memcmp(pmksa->bssid.sa_data, pmk->bssid, ETH_ALEN)) {	/* match address! list move to head. */
-				memcpy(pmk->pmkid, pmksa->pmkid,
-					IW_PMKID_LEN);
-				list_move(&pmk->list,
-					&priv->pmklist.head);
+				memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN);
+				list_move(&pmk->list, &priv->pmklist.head);
 				break; /* list_for_each */
 			}
 		}
@@ -2169,28 +2167,20 @@ static int ks_wlan_set_pmksa(struct net_device *dev,
 		if (priv->pmklist.size <= PMK_LIST_MAX) {	/* new cache data */
 			for (i = 0; i < PMK_LIST_MAX; i++) {
 				pmk = &priv->pmklist.pmk[i];
-				if (!memcmp
-					("\x00\x00\x00\x00\x00\x00",
-						pmk->bssid, ETH_ALEN))
-					break;
+				if (!memcmp("\x00\x00\x00\x00\x00\x00",
+					    pmk->bssid, ETH_ALEN))
+					break; /* loop */
 			}
-			memcpy(pmk->bssid, pmksa->bssid.sa_data,
-				ETH_ALEN);
-			memcpy(pmk->pmkid, pmksa->pmkid,
-				IW_PMKID_LEN);
-			list_add(&pmk->list,
-				&priv->pmklist.head);
+			memcpy(pmk->bssid, pmksa->bssid.sa_data, ETH_ALEN);
+			memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN);
+			list_add(&pmk->list, &priv->pmklist.head);
 			priv->pmklist.size++;
 		} else {	/* overwrite old cache data */
-			pmk =
-				list_entry(priv->pmklist.head.prev,
-					struct pmk_t, list);
-			memcpy(pmk->bssid, pmksa->bssid.sa_data,
-				ETH_ALEN);
-			memcpy(pmk->pmkid, pmksa->pmkid,
-				IW_PMKID_LEN);
-			list_move(&pmk->list,
-				&priv->pmklist.head);
+			pmk = list_entry(priv->pmklist.head.prev, struct pmk_t,
+					 list);
+			memcpy(pmk->bssid, pmksa->bssid.sa_data, ETH_ALEN);
+			memcpy(pmk->pmkid, pmksa->pmkid, IW_PMKID_LEN);
+			list_move(&pmk->list, &priv->pmklist.head);
 		}
 		break;
 	case IW_PMKSA_REMOVE:
-- 
2.7.4

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



[Index of Archives]     [Linux Driver Backports]     [DMA Engine]     [Linux GPIO]     [Linux SPI]     [Video for Linux]     [Linux USB Devel]     [Linux Coverity]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Yosemite Backpacking]
  Powered by Linux