Skip to contentSkip to conversation

staging/wlan-ng: Fixing "line over 80 characters" warnings.

PATCH In review Hennie Muller 2 participants 3 messages Jul 21, 2019 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging/wlan-ng: Fixing "line over 80 characters" warnings.

Reindent multiline function calls to be tab aligned, instead of open brace aligned. This fixes multiple "WARNING: line over 80 characters" generated by checkpatch.

---
 drivers/staging/wlan-ng/cfg80211.c    |  55 ++---
 drivers/staging/wlan-ng/hfa384x_usb.c | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/p80211conv.c  |  48 +++--
 drivers/staging/wlan-ng/p80211req.c   |   6 +-
 drivers/staging/wlan-ng/prism2fw.c    | 101 +++++----
 drivers/staging/wlan-ng/prism2mgmt.c  | 170 ++++++++--------
 drivers/staging/wlan-ng/prism2mib.c   |  14 +-
 drivers/staging/wlan-ng/prism2sta.c   | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/prism2usb.c   |  13 +-
 9 files changed, 494 insertions(+), 477 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +28 -27
index eee1998c4b18..c69fb83267ef 100644
@@ -130,8 +130,8 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
 
 	/* Set Operation mode to the PORT TYPE RID */
 	result = prism2_domibset_uint32(wlandev,
-					DIDMIB_P2_STATIC_CNFPORTTYPE,
-					data);
+			DIDMIB_P2_STATIC_CNFPORTTYPE,
+			data);
 
 	if (result)
 		err = -EFAULT;
@@ -159,8 +159,8 @@ static int prism2_add_key(struct wiphy *wiphy, struct net_device *dev,
 	}
 
 	if (prism2_domibset_uint32(wlandev,
-				   DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
-				   key_index))
+			DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+			key_index))
 		return -EFAULT;
 
 	/* send key to driver */
@@ -232,8 +232,8 @@ static int prism2_set_default_key(struct wiphy *wiphy, struct net_device *dev,
 	struct wlandevice *wlandev = dev->ml_priv;
 
 	return  prism2_domibset_uint32(wlandev,
-				       DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
-				       key_index);
+			DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID,
+			key_index);
 }
 
 static int prism2_get_station(struct wiphy *wiphy, struct net_device *dev,
@@ -366,7 +366,8 @@ static int prism2_scan(struct wiphy *wiphy,
 			msg2.beaconperiod.data,
 			ie_buf,
 			ie_len,
-			(msg2.signal.data - 65536) * 100, /* Conversion to signed type */
+			/* Conversion to signed type */
+			(msg2.signal.data - 65536) * 100,
 			GFP_KERNEL
 		);
 
@@ -403,8 +404,8 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 			data = wiphy->rts_threshold;
 
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
-						data);
+				DIDMIB_DOT11MAC_OPERATIONTABLE_RTSTHRESHOLD,
+				data);
 		if (result) {
 			err = -EFAULT;
 			goto exit;
@@ -418,8 +419,8 @@ static int prism2_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 			data = wiphy->frag_threshold;
 
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
-						data);
+			DIDMIB_DOT11MAC_OPERATIONTABLE_FRAGMENTATIONTHRESHOLD,
+			data);
 		if (result) {
 			err = -EFAULT;
 			goto exit;
@@ -448,8 +449,8 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
 	if (channel) {
 		chan = ieee80211_frequency_to_channel(channel->center_freq);
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
-						chan);
+				DIDMIB_DOT11PHY_DSSSTABLE_CURRENTCHANNEL,
+				chan);
 		if (result)
 			goto exit;
 	}
@@ -463,8 +464,8 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
 		msg_join.authtype.data = P80211ENUM_authalg_sharedkey;
 	else
 		netdev_warn(dev,
-			    "Unhandled authorisation type for connect (%d)\n",
-			    sme->auth_type);
+			"Unhandled authorisation type for connect (%d)\n",
+			sme->auth_type);
 
 	/* Set the encryption - we only support wep */
 	if (is_wep) {
@@ -484,8 +485,8 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
 			did = didmib_dot11smt_wepdefaultkeystable_key(
 					sme->key_idx + 1);
 			result = prism2_domibset_pstr32(wlandev,
-							did, sme->key_len,
-							(u8 *)sme->key);
+					did, sme->key_len,
+					(u8 *)sme->key);
 			if (result)
 				goto exit;
 		}
@@ -495,14 +496,14 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
 		 * seems reasonable anyways
 		 */
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
-						P80211ENUM_truth_true);
+				DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
+				P80211ENUM_truth_true);
 		if (result)
 			goto exit;
 
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
-						P80211ENUM_truth_true);
+				DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
+				P80211ENUM_truth_true);
 		if (result)
 			goto exit;
 
@@ -511,14 +512,14 @@ static int prism2_connect(struct wiphy *wiphy, struct net_device *dev,
 		 * and exclude unencrypted
 		 */
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
-						P80211ENUM_truth_false);
+				DIDMIB_DOT11SMT_PRIVACYTABLE_PRIVACYINVOKED,
+				P80211ENUM_truth_false);
 		if (result)
 			goto exit;
 
 		result = prism2_domibset_uint32(wlandev,
-						DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
-						P80211ENUM_truth_false);
+				DIDMIB_DOT11SMT_PRIVACYTABLE_EXCLUDEUNENCRYPTED,
+				P80211ENUM_truth_false);
 		if (result)
 			goto exit;
 	}
@@ -588,8 +589,8 @@ static int prism2_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
 		data = MBM_TO_DBM(mbm);
 
 	result = prism2_domibset_uint32(wlandev,
-		DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
-		data);
+			DIDMIB_DOT11PHY_TXPOWERTABLE_CURRENTTXPOWERLEVEL,
+			data);
 
 	if (result) {
 		err = -EFAULT;
drivers/staging/wlan-ng/hfa384x_usb.c +141 -141

670 lines not on this page · raw message

drivers/staging/wlan-ng/p80211conv.c +27 -21

110 lines not on this page · raw message

drivers/staging/wlan-ng/p80211req.c +3 -3
index 9f5c1267d829..1153fbe61772 100644
@@ -127,8 +127,8 @@ int p80211req_dorequest(struct wlandevice *wlandev, u8 *msgbuf)
 	if (!capable(CAP_NET_ADMIN) &&
 	    (msg->msgcode != DIDMSG_DOT11REQ_MIBGET)) {
 		netdev_err(wlandev->netdev,
-			   "%s: only dot11req_mibget allowed for non-root.\n",
-			   wlandev->name);
+			"%s: only dot11req_mibget allowed for non-root.\n",
+			wlandev->name);
 		return -EPERM;
 	}
 
@@ -212,7 +212,7 @@ static void p80211req_mibset_mibget(struct wlandevice *wlandev,
 		if (!isget)
 			wep_change_key(wlandev,
 				       P80211DID_ITEM(mibitem->did) - 1,
-				       key, pstr->len);
+				key, pstr->len);
 		break;
 
 	case DIDMIB_DOT11SMT_PRIVACYTABLE_WEPDEFAULTKEYID: {
drivers/staging/wlan-ng/prism2fw.c +50 -51

217 lines not on this page · raw message

drivers/staging/wlan-ng/prism2mgmt.c +87 -83

450 lines not on this page · raw message

drivers/staging/wlan-ng/prism2mib.c +7 -7
index 1eba5fa28d8f..00fa119bacca 100644
@@ -666,7 +666,7 @@ prism2mib_fragmentationthreshold(struct mibrec *mib,
 	if (!isget)
 		if ((*uint32) % 2) {
 			netdev_warn(wlandev->netdev,
-				    "Attempt to set odd number FragmentationThreshold\n");
+				"Attempt to set odd number FragmentationThreshold\n");
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_not_supported;
 			return 0;
@@ -714,9 +714,9 @@ static int prism2mib_priv(struct mibrec *mib,
 
 		if (isget) {
 			hfa384x_drvr_getconfig(hw,
-					       HFA384x_RID_CNFWPADATA,
-					       (u8 *)&wpa,
-					       sizeof(wpa));
+				HFA384x_RID_CNFWPADATA,
+				(u8 *)&wpa,
+				sizeof(wpa));
 			pstr->len = le16_to_cpu(wpa.datalen);
 			memcpy(pstr->data, wpa.data, pstr->len);
 		} else {
@@ -724,9 +724,9 @@ static int prism2mib_priv(struct mibrec *mib,
 			memcpy(wpa.data, pstr->data, pstr->len);
 
 			hfa384x_drvr_setconfig(hw,
-					       HFA384x_RID_CNFWPADATA,
-					       (u8 *)&wpa,
-					       sizeof(wpa));
+				HFA384x_RID_CNFWPADATA,
+				(u8 *)&wpa,
+				sizeof(wpa));
 		}
 		break;
 	}
drivers/staging/wlan-ng/prism2sta.c +145 -137

613 lines not on this page · raw message

drivers/staging/wlan-ng/prism2usb.c +6 -7
index b5ba176004c1..89a60e9469bb 100644
@@ -48,11 +48,11 @@ static const struct usb_device_id usb_prism_tbl[] = {
 	PRISM_DEV(0x0bb2, 0x0302, "Ambit Microsystems Corp."),
 	PRISM_DEV(0x9016, 0x182d, "Sitecom WL-022 802.11b USB Adapter"),
 	PRISM_DEV(0x0543, 0x0f01,
-		  "ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
+		"ViewSonic Airsync USB Adapter 11Mbps (Prism2.5)"),
 	PRISM_DEV(0x067c, 0x1022,
-		  "Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
+		"Siemens SpeedStream 1022 11Mbps WLAN USB Adapter"),
 	PRISM_DEV(0x049f, 0x0033,
-		  "Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
+		"Compaq/Intel W100 PRO/Wireless 11Mbps multiport WLAN Adapter"),
 	{ } /* terminator */
 };
 MODULE_DEVICE_TABLE(usb, usb_prism_tbl);
@@ -93,8 +93,7 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
 	/* Do a chip-level reset on the MAC */
 	if (prism2_doreset) {
 		result = hfa384x_corereset(hw,
-					   prism2_reset_holdtime,
-					   prism2_reset_settletime, 0);
+			prism2_reset_holdtime, prism2_reset_settletime, 0);
 		if (result != 0) {
 			result = -EIO;
 			dev_err(&interface->dev,
@@ -256,8 +255,8 @@ static int prism2sta_resume(struct usb_interface *interface)
 	/* Do a chip-level reset on the MAC */
 	if (prism2_doreset) {
 		result = hfa384x_corereset(hw,
-					   prism2_reset_holdtime,
-					   prism2_reset_settletime, 0);
+			prism2_reset_holdtime, prism2_reset_settletime, 0);
+
 		if (result != 0) {
 			unregister_wlandev(wlandev);
 			hfa384x_destroy(hw);
Signature · 1 line
2.22.0
#1 lore raw
Quoted 22 lines · Hennie Muller

Reindent multiline function calls to be tab aligned, instead of open brace aligned. This fixes multiple "WARNING: line over 80 characters" generated by checkpatch.

---
 drivers/staging/wlan-ng/cfg80211.c    |  55 ++---
 drivers/staging/wlan-ng/hfa384x_usb.c | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/p80211conv.c  |  48 +++--
 drivers/staging/wlan-ng/p80211req.c   |   6 +-
 drivers/staging/wlan-ng/prism2fw.c    | 101 +++++----
 drivers/staging/wlan-ng/prism2mgmt.c  | 170 ++++++++--------
 drivers/staging/wlan-ng/prism2mib.c   |  14 +-
 drivers/staging/wlan-ng/prism2sta.c   | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/prism2usb.c   |  13 +-
 9 files changed, 494 insertions(+), 477 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +0 -0
index eee1998c4b18..c69fb83267ef 100644

drivers/staging/wlan-ng/cfg80211.c static int prism2_change_virtual_intf(struct wiphy *wiphy, · line 134

Quoted 7 lines
drivers/staging/wlan-ng/cfg80211.c +2 -2
@@ -130,8 +130,8 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
 
 	/* Set Operation mode to the PORT TYPE RID */
 	result = prism2_domibset_uint32(wlandev,
-					DIDMIB_P2_STATIC_CNFPORTTYPE,
-					data);
+			DIDMIB_P2_STATIC_CNFPORTTYPE,
+			data);

This then violates another checkpatch warning, so you can't win :(

Just leave it as-is, it's fine, right? Coding styles are there to make things easy to read and understand, and the code is fine like this.

So don't move arguments to the left of the '(' character on the line above please.

thanks,

greg k-h

#2 lore raw
Quoted 33 lines · Greg Kroah-Hartman
Quoted 22 lines · Hennie Muller

Reindent multiline function calls to be tab aligned, instead of open brace aligned. This fixes multiple "WARNING: line over 80 characters" generated by checkpatch.

---
 drivers/staging/wlan-ng/cfg80211.c    |  55 ++---
 drivers/staging/wlan-ng/hfa384x_usb.c | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/p80211conv.c  |  48 +++--
 drivers/staging/wlan-ng/p80211req.c   |   6 +-
 drivers/staging/wlan-ng/prism2fw.c    | 101 +++++----
 drivers/staging/wlan-ng/prism2mgmt.c  | 170 ++++++++--------
 drivers/staging/wlan-ng/prism2mib.c   |  14 +-
 drivers/staging/wlan-ng/prism2sta.c   | 282 +++++++++++++-------------
 drivers/staging/wlan-ng/prism2usb.c   |  13 +-
 9 files changed, 494 insertions(+), 477 deletions(-)
drivers/staging/wlan-ng/cfg80211.c +0 -0
index eee1998c4b18..c69fb83267ef 100644

drivers/staging/wlan-ng/cfg80211.c static int prism2_change_virtual_intf(struct wiphy *wiphy, · line 134

Quoted 7 lines
drivers/staging/wlan-ng/cfg80211.c +2 -2
@@ -130,8 +130,8 @@ static int prism2_change_virtual_intf(struct wiphy *wiphy,
 
 	/* Set Operation mode to the PORT TYPE RID */
 	result = prism2_domibset_uint32(wlandev,
-					DIDMIB_P2_STATIC_CNFPORTTYPE,
-					data);
+			DIDMIB_P2_STATIC_CNFPORTTYPE,
+			data);

This then violates another checkpatch warning, so you can't win :(

Quoted 2 lines

Just leave it as-is, it's fine, right? Coding styles are there to make things easy to read and understand, and the code is fine like this.

Ok, perfect. I understand thanks. I'll move on to my next "first" contribution then. :-)

Quoted 7 lines

So don't move arguments to the left of the '(' character on the line above please.

thanks,

greg k-h