[PATCH 1/8] wlan-ng/prism2mgmt:checkpatch: Fix long lines

[PATCH 1/8] wlan-ng/prism2mgmt:checkpatch: Fix long lines

[Johannes Stadlinger]

This patch fixes all warnings of checkpatch about lines over 80
characters.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 
CC: Himangi Saraogi <himangi774@gmail.com>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2mgmt.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index d110b36..36a3e1a 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -156,7 +156,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 					  HFA384x_ROAMMODE_HOSTSCAN_HOSTROAM);
 	if (result) {
 		netdev_err(wlandev->netdev,
-			   "setconfig(ROAMINGMODE) failed. result=%d\n", result);
+			   "setconfig(ROAMINGMODE) failed. result=%d\n",
+			   result);
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		goto exit;
@@ -273,7 +274,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 		result = hfa384x_drvr_enable(hw, 0);
 		if (result) {
 			netdev_err(wlandev->netdev,
-				   "drvr_enable(0) failed. result=%d\n", result);
+				   "drvr_enable(0) failed. result=%d\n",
+				   result);
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_implementation_failure;
 			goto exit;
@@ -293,7 +295,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 					sizeof(hfa384x_HostScanRequest_data_t));
 	if (result) {
 		netdev_err(wlandev->netdev,
-			   "setconfig(SCANREQUEST) failed. result=%d\n", result);
+			   "setconfig(SCANREQUEST) failed. result=%d\n",
+			   result);
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		goto exit;
@@ -315,7 +318,8 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 		result = hfa384x_drvr_disable(hw, 0);
 		if (result) {
 			netdev_err(wlandev->netdev,
-				   "drvr_disable(0) failed. result=%d\n", result);
+				   "drvr_disable(0) failed. result=%d\n",
+				   result);
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_implementation_failure;
 			goto exit;
@@ -654,7 +658,8 @@ int prism2mgmt_start(wlandevice_t *wlandev, void *msgp)
 
 	result = hfa384x_drvr_setconfig16(hw, HFA384x_RID_TXRATECNTL, word);
 	if (result) {
-		netdev_err(wlandev->netdev, "Failed to set txrates=%d.\n", word);
+		netdev_err(wlandev->netdev, "Failed to set txrates=%d.\n",
+			   word);
 		goto failed;
 	}
 
-- 
1.9.1

[PATCH 2/8] wlan-ng/prism2mgmt:checkpatch: Fix string split

[Johannes Stadlinger]

This patch fixes all warnings of checkpatch about string splitting.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Himangi Saraogi <himangi774@gmail.com>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2mgmt.c | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index 36a3e1a..f90f7da 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -178,8 +178,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 					     word);
 		if (result) {
 			netdev_warn(wlandev->netdev,
-				    "Passive scan not supported with "
-				    "current firmware.  (<1.5.1)\n");
+				    "Passive scan not supported with current firmware.  (<1.5.1)\n");
 		}
 	}
 
@@ -381,8 +380,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
 
 	if (!hw->scanresults) {
 		netdev_err(wlandev->netdev,
-			   "dot11req_scan_results can only be used after "
-			   "a successful dot11req_scan.\n");
+			   "dot11req_scan_results can only be used after a successful dot11req_scan.\n");
 		result = 2;
 		req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
 		goto exit;
@@ -733,8 +731,8 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
 					      HFA384x_PDA_LEN_MAX);
 		if (result) {
 			netdev_err(wlandev->netdev,
-				   "hfa384x_drvr_readpda() failed, "
-				   "result=%d\n", result);
+				   "hfa384x_drvr_readpda() failed, result=%d\n",
+				   result);
 
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_implementation_failure;
@@ -782,8 +780,7 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
 
 	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
 		netdev_err(wlandev->netdev,
-			   "ramdl_state(): may only be called "
-			   "in the fwload state.\n");
+			   "ramdl_state(): may only be called in the fwload state.\n");
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
@@ -841,8 +838,7 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
 
 	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
 		netdev_err(wlandev->netdev,
-			   "ramdl_write(): may only be called "
-			   "in the fwload state.\n");
+			   "ramdl_write(): may only be called in the fwload state.\n");
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
@@ -901,8 +897,7 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
 
 	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
 		netdev_err(wlandev->netdev,
-			   "flashdl_state(): may only be called "
-			   "in the fwload state.\n");
+			   "flashdl_state(): may only be called in the fwload state.\n");
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
@@ -936,8 +931,8 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
 		result = prism2sta_ifstate(wlandev, P80211ENUM_ifstate_fwload);
 		if (result != P80211ENUM_resultcode_success) {
 			netdev_err(wlandev->netdev,
-				   "prism2sta_ifstate(fwload) failed,"
-				   "P80211ENUM_resultcode=%d\n", result);
+				   "prism2sta_ifstate(fwload) failed, P80211ENUM_resultcode=%d\n",
+				   result);
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_implementation_failure;
 			result = -1;
@@ -975,8 +970,7 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
 
 	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
 		netdev_err(wlandev->netdev,
-			   "flashdl_write(): may only be called "
-			   "in the fwload state.\n");
+			   "flashdl_write(): may only be called in the fwload state.\n");
 		msg->resultcode.data =
 		    P80211ENUM_resultcode_implementation_failure;
 		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
-- 
1.9.1

[PATCH 3/8] wlan-ng/prism2mgmt:checkpatch: Insert blank line

[Johannes Stadlinger]

This patch inserts a blank line after a declaration to avoid checkpatch
warning.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Himangi Saraogi <himangi774@gmail.com>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2mgmt.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
index f90f7da..e6a82d3 100644
--- a/drivers/staging/wlan-ng/prism2mgmt.c
+++ b/drivers/staging/wlan-ng/prism2mgmt.c
@@ -190,6 +190,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
 	word = 0;
 	for (i = 0; i < msg->channellist.data.len; i++) {
 		u8 channel = msg->channellist.data.data[i];
+
 		if (channel > 14)
 			continue;
 		/* channel 1 is BIT 0 ... channel 14 is BIT 13 */
-- 
1.9.1

[PATCH 4/8] wlan-ng/prism2mib:checkpatch: Fix string split

[Johannes Stadlinger]

This patch fixes a warning of checkpatch about string splitting.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: Himangi Saraogi <himangi774@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2mib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index 0fb42df..bdd3b4c 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -672,8 +672,8 @@ static int prism2mib_fragmentationthreshold(struct mibrec *mib,
 
 	if (!isget)
 		if ((*uint32) % 2) {
-			netdev_warn(wlandev->netdev, "Attempt to set odd number "
-			       "FragmentationThreshold\n");
+			netdev_warn(wlandev->netdev,
+				    "Attempt to set odd number FragmentationThreshold\n");
 			msg->resultcode.data =
 			    P80211ENUM_resultcode_not_supported;
 			return 0;
-- 
1.9.1

[PATCH 5/8] wlan-ng/prism2mib:checkpatch: Insert blank lines

[Johannes Stadlinger]

This patch inserts blank lines after declarations to avoid checkpatch
warning.

After our fixes in 'wlan-ng/prism2mib.c' there are still two checkpatch
warnings about lines over 80 characters remaining.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: Himangi Saraogi <himangi774@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2mib.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
index bdd3b4c..3ea24d6 100644
--- a/drivers/staging/wlan-ng/prism2mib.c
+++ b/drivers/staging/wlan-ng/prism2mib.c
@@ -85,7 +85,8 @@ struct mibrec {
 	u16 parm1;
 	u16 parm2;
 	u16 parm3;
-	int (*func) (struct mibrec *mib,
+
+	int (*func)(struct mibrec *mib,
 		     int isget,
 		     wlandevice_t *wlandev,
 		     hfa384x_t *hw,
@@ -722,6 +723,7 @@ static int prism2mib_priv(struct mibrec *mib,
 	switch (mib->did) {
 	case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
 			hfa384x_WPAData_t wpa;
+
 			if (isget) {
 				hfa384x_drvr_getconfig(hw,
 						       HFA384x_RID_CNFWPADATA,
-- 
1.9.1

[PATCH 6/8] wlan-ng/prism2sta:checkpatch: Fix long lines

[Johannes Stadlinger]

This patch fixes all warning of checkpatch about lines over 80
characters.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Tugce Sirin <ztugcesirin@gmail.com>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Neil Armstrong <superna9999@gmail.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2sta.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 278b6a1..a449fdf 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -452,7 +452,8 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			result = hfa384x_drvr_start(hw);
 			if (result) {
 				netdev_err(wlandev->netdev,
-				       "hfa384x_drvr_start() failed,result=%d\n", (int)result);
+					   "hfa384x_drvr_start() failed,result=%d\n",
+					   (int)result);
 				result =
 				 P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
@@ -496,7 +497,8 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			result = hfa384x_drvr_start(hw);
 			if (result) {
 				netdev_err(wlandev->netdev,
-				       "hfa384x_drvr_start() failed,result=%d\n", (int)result);
+					   "hfa384x_drvr_start() failed,result=%d\n",
+					   (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				wlandev->msdstate = WLAN_MSD_HWPRESENT;
@@ -506,7 +508,8 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			result = prism2sta_getcardinfo(wlandev);
 			if (result) {
 				netdev_err(wlandev->netdev,
-				       "prism2sta_getcardinfo() failed,result=%d\n", (int)result);
+					   "prism2sta_getcardinfo() failed,result=%d\n",
+					   (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
@@ -516,7 +519,8 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			result = prism2sta_globalsetup(wlandev);
 			if (result) {
 				netdev_err(wlandev->netdev,
-				       "prism2sta_globalsetup() failed,result=%d\n", (int)result);
+					   "prism2sta_globalsetup() failed,result=%d\n",
+					   (int)result);
 				result =
 				  P80211ENUM_resultcode_implementation_failure;
 				hfa384x_drvr_stop(hw);
@@ -1271,7 +1275,8 @@ void prism2sta_processing_defer(struct work_struct *data)
 				     HFA384x_RID_CURRENTSSID, result);
 				return;
 			}
-			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
+			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *)
+									&ssid,
 						(p80211pstrd_t *) &
 						wlandev->ssid);
 
-- 
1.9.1

[PATCH 7/8] wlan-ng/prism2sta:checkpatch: Fix string split

[Johannes Stadlinger]

This patch fixes a warning of checkpatch about string splitting.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Tugce Sirin <ztugcesirin@gmail.com>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: Neil Armstrong <superna9999@gmail.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2sta.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index a449fdf..9444006 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -468,8 +468,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
 			break;
 		case WLAN_MSD_RUNNING:
 			netdev_warn(wlandev->netdev,
-			       "Cannot enter fwload state from enable state,"
-			       "you must disable first.\n");
+				    "Cannot enter fwload state from enable state, you must disable first.\n");
 			result = P80211ENUM_resultcode_invalid_parameters;
 			break;
 		case WLAN_MSD_HWFAIL:
-- 
1.9.1

[PATCH 8/8] wlan-ng/prism2sta:checkpatch: Insert blank lines

[Johannes Stadlinger]

This patch inserts blank lines after declarations to avoid checkpatch
warnings.

After our fixes in 'wlan-ng/prism2sta' there is still a checkpatch
warning about prefering 'ether_addr_copy' instead of 'memcpy'
remaining.

Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
CC: linux-kernel@i4.cs.fau.de
CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
CC: Tugce Sirin <ztugcesirin@gmail.com>
CC: Josh Triplett <josh@joshtriplett.org>
CC: Himangi Saraogi <himangi774@gmail.com>
CC: Paul Gortmaker <paul.gortmaker@windriver.com>
CC: Vitaly Osipov <vitaly.osipov@gmail.com>
CC: Neil Armstrong <superna9999@gmail.com>
CC: devel@driverdev.osuosl.org
CC: linux-kernel@vger.kernel.org
---
 drivers/staging/wlan-ng/prism2sta.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index 9444006..8d4d7ba 100644
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -360,6 +360,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
 	case DIDmsg_lnxreq_ifstate:
 		{
 			struct p80211msg_lnxreq_ifstate *ifstatemsg;
+
 			pr_debug("Received mlme ifstate request\n");
 			ifstatemsg = (struct p80211msg_lnxreq_ifstate *) msg;
 			result =
@@ -1411,6 +1412,7 @@ void prism2sta_processing_defer(struct work_struct *data)
 		 */
 		if (hw->join_ap && --hw->join_retries > 0) {
 			hfa384x_JoinRequest_data_t joinreq;
+
 			joinreq = hw->joinreq;
 			/* Send the join request */
 			hfa384x_drvr_setconfig(hw,
-- 
1.9.1

Re: [PATCH 2/8] wlan-ng/prism2mgmt:checkpatch: Fix string split

[josh]

On Thu, Jun 19, 2014 at 09:20:14PM +0200, Johannes Stadlinger wrote:
> This patch fixes all warnings of checkpatch about string splitting.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Himangi Saraogi <himangi774@gmail.com>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/staging/wlan-ng/prism2mgmt.c | 26 ++++++++++----------------
>  1 file changed, 10 insertions(+), 16 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
> index 36a3e1a..f90f7da 100644
> --- a/drivers/staging/wlan-ng/prism2mgmt.c
> +++ b/drivers/staging/wlan-ng/prism2mgmt.c
> @@ -178,8 +178,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
>  					     word);
>  		if (result) {
>  			netdev_warn(wlandev->netdev,
> -				    "Passive scan not supported with "
> -				    "current firmware.  (<1.5.1)\n");
> +				    "Passive scan not supported with current firmware.  (<1.5.1)\n");
>  		}
>  	}
>  
> @@ -381,8 +380,7 @@ int prism2mgmt_scan_results(wlandevice_t *wlandev, void *msgp)
>  
>  	if (!hw->scanresults) {
>  		netdev_err(wlandev->netdev,
> -			   "dot11req_scan_results can only be used after "
> -			   "a successful dot11req_scan.\n");
> +			   "dot11req_scan_results can only be used after a successful dot11req_scan.\n");
>  		result = 2;
>  		req->resultcode.data = P80211ENUM_resultcode_invalid_parameters;
>  		goto exit;
> @@ -733,8 +731,8 @@ int prism2mgmt_readpda(wlandevice_t *wlandev, void *msgp)
>  					      HFA384x_PDA_LEN_MAX);
>  		if (result) {
>  			netdev_err(wlandev->netdev,
> -				   "hfa384x_drvr_readpda() failed, "
> -				   "result=%d\n", result);
> +				   "hfa384x_drvr_readpda() failed, result=%d\n",
> +				   result);
>  
>  			msg->resultcode.data =
>  			    P80211ENUM_resultcode_implementation_failure;
> @@ -782,8 +780,7 @@ int prism2mgmt_ramdl_state(wlandevice_t *wlandev, void *msgp)
>  
>  	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
>  		netdev_err(wlandev->netdev,
> -			   "ramdl_state(): may only be called "
> -			   "in the fwload state.\n");
> +			   "ramdl_state(): may only be called in the fwload state.\n");
>  		msg->resultcode.data =
>  		    P80211ENUM_resultcode_implementation_failure;
>  		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
> @@ -841,8 +838,7 @@ int prism2mgmt_ramdl_write(wlandevice_t *wlandev, void *msgp)
>  
>  	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
>  		netdev_err(wlandev->netdev,
> -			   "ramdl_write(): may only be called "
> -			   "in the fwload state.\n");
> +			   "ramdl_write(): may only be called in the fwload state.\n");
>  		msg->resultcode.data =
>  		    P80211ENUM_resultcode_implementation_failure;
>  		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
> @@ -901,8 +897,7 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
>  
>  	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
>  		netdev_err(wlandev->netdev,
> -			   "flashdl_state(): may only be called "
> -			   "in the fwload state.\n");
> +			   "flashdl_state(): may only be called in the fwload state.\n");
>  		msg->resultcode.data =
>  		    P80211ENUM_resultcode_implementation_failure;
>  		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
> @@ -936,8 +931,8 @@ int prism2mgmt_flashdl_state(wlandevice_t *wlandev, void *msgp)
>  		result = prism2sta_ifstate(wlandev, P80211ENUM_ifstate_fwload);
>  		if (result != P80211ENUM_resultcode_success) {
>  			netdev_err(wlandev->netdev,
> -				   "prism2sta_ifstate(fwload) failed,"
> -				   "P80211ENUM_resultcode=%d\n", result);
> +				   "prism2sta_ifstate(fwload) failed, P80211ENUM_resultcode=%d\n",
> +				   result);
>  			msg->resultcode.data =
>  			    P80211ENUM_resultcode_implementation_failure;
>  			result = -1;
> @@ -975,8 +970,7 @@ int prism2mgmt_flashdl_write(wlandevice_t *wlandev, void *msgp)
>  
>  	if (wlandev->msdstate != WLAN_MSD_FWLOAD) {
>  		netdev_err(wlandev->netdev,
> -			   "flashdl_write(): may only be called "
> -			   "in the fwload state.\n");
> +			   "flashdl_write(): may only be called in the fwload state.\n");
>  		msg->resultcode.data =
>  		    P80211ENUM_resultcode_implementation_failure;
>  		msg->resultcode.status = P80211ENUM_msgitem_status_data_ok;
> -- 
> 1.9.1
> 

Re: [PATCH 3/8] wlan-ng/prism2mgmt:checkpatch: Insert blank line

[josh]

On Thu, Jun 19, 2014 at 09:20:15PM +0200, Johannes Stadlinger wrote:
> This patch inserts a blank line after a declaration to avoid checkpatch
> warning.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Himangi Saraogi <himangi774@gmail.com>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

This is one case where I think checkpatch is just wrong; this doesn't
make the code any more (or less) readable.

Meh-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/staging/wlan-ng/prism2mgmt.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c
> index f90f7da..e6a82d3 100644
> --- a/drivers/staging/wlan-ng/prism2mgmt.c
> +++ b/drivers/staging/wlan-ng/prism2mgmt.c
> @@ -190,6 +190,7 @@ int prism2mgmt_scan(wlandevice_t *wlandev, void *msgp)
>  	word = 0;
>  	for (i = 0; i < msg->channellist.data.len; i++) {
>  		u8 channel = msg->channellist.data.data[i];
> +
>  		if (channel > 14)
>  			continue;
>  		/* channel 1 is BIT 0 ... channel 14 is BIT 13 */
> -- 
> 1.9.1
> 

Re: [PATCH 4/8] wlan-ng/prism2mib:checkpatch: Fix string split

[josh]

On Thu, Jun 19, 2014 at 09:20:16PM +0200, Johannes Stadlinger wrote:
> This patch fixes a warning of checkpatch about string splitting.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: Himangi Saraogi <himangi774@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/staging/wlan-ng/prism2mib.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
> index 0fb42df..bdd3b4c 100644
> --- a/drivers/staging/wlan-ng/prism2mib.c
> +++ b/drivers/staging/wlan-ng/prism2mib.c
> @@ -672,8 +672,8 @@ static int prism2mib_fragmentationthreshold(struct mibrec *mib,
>  
>  	if (!isget)
>  		if ((*uint32) % 2) {
> -			netdev_warn(wlandev->netdev, "Attempt to set odd number "
> -			       "FragmentationThreshold\n");
> +			netdev_warn(wlandev->netdev,
> +				    "Attempt to set odd number FragmentationThreshold\n");
>  			msg->resultcode.data =
>  			    P80211ENUM_resultcode_not_supported;
>  			return 0;
> -- 
> 1.9.1
> 

Re: [PATCH 5/8] wlan-ng/prism2mib:checkpatch: Insert blank lines

[josh]

On Thu, Jun 19, 2014 at 09:20:17PM +0200, Johannes Stadlinger wrote:
> This patch inserts blank lines after declarations to avoid checkpatch
> warning.
> 
> After our fixes in 'wlan-ng/prism2mib.c' there are still two checkpatch
> warnings about lines over 80 characters remaining.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: Himangi Saraogi <himangi774@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org
> ---
>  drivers/staging/wlan-ng/prism2mib.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
> index bdd3b4c..3ea24d6 100644
> --- a/drivers/staging/wlan-ng/prism2mib.c
> +++ b/drivers/staging/wlan-ng/prism2mib.c
> @@ -85,7 +85,8 @@ struct mibrec {
>  	u16 parm1;
>  	u16 parm2;
>  	u16 parm3;
> -	int (*func) (struct mibrec *mib,
> +
> +	int (*func)(struct mibrec *mib,

Eliminating the space here makes sense, but checkpatch shouldn't warn
about spaces after declarations between two fields in the middle of a
structure declaration.

>  		     int isget,
>  		     wlandevice_t *wlandev,
>  		     hfa384x_t *hw,
> @@ -722,6 +723,7 @@ static int prism2mib_priv(struct mibrec *mib,
>  	switch (mib->did) {
>  	case DIDmib_lnx_lnxConfigTable_lnxRSNAIE:{
>  			hfa384x_WPAData_t wpa;
> +
>  			if (isget) {
>  				hfa384x_drvr_getconfig(hw,
>  						       HFA384x_RID_CNFWPADATA,
> -- 
> 1.9.1
> 

Re: [PATCH 6/8] wlan-ng/prism2sta:checkpatch: Fix long lines

[josh]

On Thu, Jun 19, 2014 at 09:20:18PM +0200, Johannes Stadlinger wrote:
> This patch fixes all warning of checkpatch about lines over 80
> characters.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Tugce Sirin <ztugcesirin@gmail.com>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Neil Armstrong <superna9999@gmail.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

Most of these look fine, but...

> @@ -1271,7 +1275,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  				     HFA384x_RID_CURRENTSSID, result);
>  				return;
>  			}
> -			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
> +			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *)
> +									&ssid,
>  						(p80211pstrd_t *) &
>  						wlandev->ssid);

...that (and the one in the subsequent context lines) looks horrible.
I'd suggest breaking after the opening parenthesis of the function call
and just indenting the arguments by one tab:
	foo_with_long_name(
		long_arg,
		another_long_arg);

Better yet, ignore checkpatch and format that call more readably as
though the 80 column rule didn't exist.

Re: [PATCH 7/8] wlan-ng/prism2sta:checkpatch: Fix string split

[josh]

On Thu, Jun 19, 2014 at 09:20:19PM +0200, Johannes Stadlinger wrote:
> This patch fixes a warning of checkpatch about string splitting.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Tugce Sirin <ztugcesirin@gmail.com>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: Neil Armstrong <superna9999@gmail.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/staging/wlan-ng/prism2sta.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
> index a449fdf..9444006 100644
> --- a/drivers/staging/wlan-ng/prism2sta.c
> +++ b/drivers/staging/wlan-ng/prism2sta.c
> @@ -468,8 +468,7 @@ u32 prism2sta_ifstate(wlandevice_t *wlandev, u32 ifstate)
>  			break;
>  		case WLAN_MSD_RUNNING:
>  			netdev_warn(wlandev->netdev,
> -			       "Cannot enter fwload state from enable state,"
> -			       "you must disable first.\n");
> +				    "Cannot enter fwload state from enable state, you must disable first.\n");
>  			result = P80211ENUM_resultcode_invalid_parameters;
>  			break;
>  		case WLAN_MSD_HWFAIL:
> -- 
> 1.9.1
> 

Re: [PATCH 8/8] wlan-ng/prism2sta:checkpatch: Insert blank lines

[josh]

On Thu, Jun 19, 2014 at 09:20:20PM +0200, Johannes Stadlinger wrote:
> This patch inserts blank lines after declarations to avoid checkpatch
> warnings.
> 
> After our fixes in 'wlan-ng/prism2sta' there is still a checkpatch
> warning about prefering 'ether_addr_copy' instead of 'memcpy'
> remaining.
> 
> Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> CC: linux-kernel@i4.cs.fau.de
> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> CC: Tugce Sirin <ztugcesirin@gmail.com>
> CC: Josh Triplett <josh@joshtriplett.org>
> CC: Himangi Saraogi <himangi774@gmail.com>
> CC: Paul Gortmaker <paul.gortmaker@windriver.com>
> CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> CC: Neil Armstrong <superna9999@gmail.com>
> CC: devel@driverdev.osuosl.org
> CC: linux-kernel@vger.kernel.org

This one does look like an improvement.

Reviewed-by: Josh Triplett <josh@joshtriplett.org>

>  drivers/staging/wlan-ng/prism2sta.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
> index 9444006..8d4d7ba 100644
> --- a/drivers/staging/wlan-ng/prism2sta.c
> +++ b/drivers/staging/wlan-ng/prism2sta.c
> @@ -360,6 +360,7 @@ static int prism2sta_mlmerequest(wlandevice_t *wlandev, struct p80211msg *msg)
>  	case DIDmsg_lnxreq_ifstate:
>  		{
>  			struct p80211msg_lnxreq_ifstate *ifstatemsg;
> +
>  			pr_debug("Received mlme ifstate request\n");
>  			ifstatemsg = (struct p80211msg_lnxreq_ifstate *) msg;
>  			result =
> @@ -1411,6 +1412,7 @@ void prism2sta_processing_defer(struct work_struct *data)
>  		 */
>  		if (hw->join_ap && --hw->join_retries > 0) {
>  			hfa384x_JoinRequest_data_t joinreq;
> +
>  			joinreq = hw->joinreq;
>  			/* Send the join request */
>  			hfa384x_drvr_setconfig(hw,
> -- 
> 1.9.1
> 

Re: [PATCH 6/8] wlan-ng/prism2sta:checkpatch: Fix long lines

[Joe Perches]

On Thu, 2014-06-19 at 21:20 +0200, Johannes Stadlinger wrote:
> This patch fixes all warning of checkpatch about lines over 80
> characters.

trivia:

> diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
[]
> @@ -1271,7 +1275,8 @@ void prism2sta_processing_defer(struct work_struct *data)
>  				     HFA384x_RID_CURRENTSSID, result);
>  				return;
>  			}
> -			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *) &ssid,
> +			prism2mgmt_bytestr2pstr((struct hfa384x_bytestr *)
> +									&ssid,
>  						(p80211pstrd_t *) &
>  						wlandev->ssid);

I don't find this better or easier to read.

Sometimes it's easier to read to cast to a
void * instead of the specific type

			prism2mgmt_bytestr2pstr((void *)&ssid,
						(void *)&wlandev->ssid);

 

Re: [PATCH 5/8] wlan-ng/prism2mib:checkpatch: Insert blank lines

[Joe Perches]

On Thu, 2014-06-19 at 13:14 -0700, josh@joshtriplett.org wrote:
> On Thu, Jun 19, 2014 at 09:20:17PM +0200, Johannes Stadlinger wrote:
> > This patch inserts blank lines after declarations to avoid checkpatch
> > warning.
[]
> > diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c
[]
> > @@ -85,7 +85,8 @@ struct mibrec {
> >  	u16 parm1;
> >  	u16 parm2;
> >  	u16 parm3;
> > -	int (*func) (struct mibrec *mib,
> > +
> > +	int (*func)(struct mibrec *mib,
> 
> Eliminating the space here makes sense, but checkpatch shouldn't warn
> about spaces after declarations between two fields in the middle of a
> structure declaration.

It's a defect in checkpatch,
It's fixed in the latest version in -next

https://lkml.org/lkml/2014/6/6/426

Re: [PATCH 3/8] wlan-ng/prism2mgmt:checkpatch: Insert blank line

[Dan Carpenter]

On Thu, Jun 19, 2014 at 01:11:40PM -0700, josh@joshtriplett.org wrote:
> On Thu, Jun 19, 2014 at 09:20:15PM +0200, Johannes Stadlinger wrote:
> > This patch inserts a blank line after a declaration to avoid checkpatch
> > warning.
> > 
> > Signed-off-by: Johannes Stadlinger <Johannes.Stadlinger@fau.de>
> > Signed-off-by: Maximilian Eschenbacher <maximilian@eschenbacher.email>
> > CC: linux-kernel@i4.cs.fau.de
> > CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > CC: Josh Triplett <josh@joshtriplett.org>
> > CC: Himangi Saraogi <himangi774@gmail.com>
> > CC: Vitaly Osipov <vitaly.osipov@gmail.com>
> > CC: devel@driverdev.osuosl.org
> > CC: linux-kernel@vger.kernel.org
> 
> This is one case where I think checkpatch is just wrong; this doesn't
> make the code any more (or less) readable.
> 
> Meh-by: Josh Triplett <josh@joshtriplett.org>

We've asked about making checkpatch ignore small blocks but apparently
that is a hard thing.  It's less work to apply these than to argue about
them and adding a space doesn't hurt so meh is correct.

regards,
dan carpenter