Skip to contentSkip to conversation

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

PATCH Superseded John B. Wyatt IV 2 participants 2 messages Mar 20, 2020 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 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 and make the code easier to read.

Issue reported by checkpatch.

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

---
 drivers/staging/wlan-ng/hfa384x_usb.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/hfa384x_usb.c +5 -4
index f8485601aead..9016e6b32efc 100644
@@ -3252,15 +3252,16 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 	struct hfa384x *hw = wlandev->priv;
 	int hdrlen;
 	struct p80211_rxmeta *rxmeta;
-	u16 data_len;
-	u16 fc;
+	u16 data_len, fc, 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 +3320,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
#1 lore raw
Quoted 7 lines · John B. Wyatt IV

Create a new 'status' variable to store the value of a long argument and make the code easier to read.

Issue reported by checkpatch.

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

I'm not sure to understand the purpose of the note. This is to justify why you don't put it in another place? Since you are just naming a long expression, the only reasonable place to put it would seem to be where that long expression occurred.

julia

Quoted 48 lines
---
 drivers/staging/wlan-ng/hfa384x_usb.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/staging/wlan-ng/hfa384x_usb.c +5 -5
index f8485601aead..9016e6b32efc 100644
@@ -3252,15 +3252,16 @@ static void hfa384x_usbin_rx(struct wlandevice *wlandev, struct sk_buff *skb)
 	struct hfa384x *hw = wlandev->priv;
 	int hdrlen;
 	struct p80211_rxmeta *rxmeta;
-	u16 data_len;
-	u16 fc;
+	u16 data_len, fc, 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 +3320,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;
 	}
 }
--

2.25.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20200320095459.2409384-1-jbwyatt4%40gmail.com.