Skip to contentSkip to conversation

staging: wlan-ng: Fix third argument going over 80 characters

PATCH In review John B. Wyatt IV 2 participants 2 messages Mar 21, 2020 – Mar 23, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 staging: wlan-ng: Fix third argument going over 80 characters

Create a new 'status' variable to store the value of a long argument that goes over 80 characters. The status variable is also used for an if check. Replacing that long statement in both places makes the code much easier to read.

Note: the status variable is assigned after a needed byte order conversion for usbin->rxfrm.desc.status, which uses a reference.

Issue reported by checkpatch.

---
v3: Resubmitting after style comments from Greg Kroah-Hartman <[email protected]>

v2: Resubmitting after git rebase and comments from Julia Lawall <[email protected]>

 drivers/staging/wlan-ng/hfa384x_usb.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/staging/wlan-ng/hfa384x_usb.c +5 -2
index f8485601aead..e38acb58cd5e 100644
@@ -3254,13 +3254,16 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 	struct p80211_rxmeta *rxmeta;
 	u16 data_len;
 	u16 fc;
+	u16 status;
 
 	/* Byte order convert once up front. */
 	le16_to_cpus(&usbin->rxfrm.desc.status);
 	le32_to_cpus(&usbin->rxfrm.desc.time);
 
 	/* Now handle frame based on port# */
-	switch (HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status)) {
+	status = HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status);
+
+	switch (status) {
 	case 0:
 		fc = le16_to_cpu(usbin->rxfrm.desc.frame_control);
 
@@ -3319,7 +3322,7 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 	default:
 		netdev_warn(hw->wlandev->netdev,
 			    "Received frame on unsupported port=%d\n",
-			    HFA384x_RXSTATUS_MACPORT_GET(usbin->rxfrm.desc.status));
+			    status);
 		break;
 	}
 }
Signature · 1 line
2.25.1
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · On Sat, 21 Mar 2020 15:58:08 -0700 "John B. Wyatt IV" <[email protected]>…

Create a new 'status' variable to store the value of a long argument that goes over 80 characters. The status variable is also used for an if check. Replacing that long statement in both places makes the code much easier to read.

Note: the status variable is assigned after a needed byte order conversion for usbin->rxfrm.desc.status, which uses a reference.

This looks rather verbose to me, but it's factually correct after all.

Quoted 4 lines

Issue reported by checkpatch.

Signature · 1 line
Stefano