[PATCH 1/3] staging: wlags49_h2: ap_h2: fixes coding style issues

[PATCH 1/3] staging: wlags49_h2: ap_h2: fixes coding style issues

[Johan Meiring]

This corrects several instances of spaces before tabs and incorrect spacing around "*" characters.  It also fixes some 80+ character line length issues, but the majority of such cases have been left as is, as this was probably the author's intention.

Signed-off-by: Johan Meiring <johanmeiring@gmail.com>
---
 drivers/staging/wlags49_h2/ap_h2.c |   56 +++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/drivers/staging/wlags49_h2/ap_h2.c b/drivers/staging/wlags49_h2/ap_h2.c
index eb8244c..9bba270 100644
--- a/drivers/staging/wlags49_h2/ap_h2.c
+++ b/drivers/staging/wlags49_h2/ap_h2.c
@@ -25,10 +25,10 @@
  */
 
 
-#include "hcfcfg.h"				/* to get hcf_16 etc defined as well as */
-					/* possible settings which inluence mdd.h or dhf.h */
-#include "mdd.h"   				/* to get COMP_ID_STA etc defined */
-#include "dhf.h"   				/* used to be "fhfmem.h", to get memblock,plugrecord, */
+#include "hcfcfg.h"	/* to get hcf_16 etc defined as well as */
+			/* possible settings which inluence mdd.h or dhf.h */
+#include "mdd.h"	/* to get COMP_ID_STA etc defined */
+#include "dhf.h"	/* used to be "fhfmem.h", to get memblock,plugrecord */
 
 static const hcf_8 fw_image_1_data[] = {
 	 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -3241,9 +3241,9 @@ static const CFG_IDENTITY_STRCT fw_image_infoidentity[] = {
 		sizeof(CFG_IDENTITY_STRCT) / sizeof(hcf_16) - 1,
 		CFG_FW_IDENTITY,
 		COMP_ID_FW_AP,
-		2,							/* Variant /
-		2,							/* Major */
-		36							/* Minor */
+		2,					/* Variant */
+		2,					/* Major */
+		36					/* Minor */
 	},
 	{ 0000, 0000, 0000, 0000, 0000, 0000 }		/* endsentinel */
 };
@@ -3254,43 +3254,43 @@ static const CFG_PROG_STRCT fw_image_code[] = {
 		CFG_PROG,
 		CFG_PROG_VOLATILE,			/* mode */
 		0x0146,		/* sizeof(fw_image_1_data), */
-		0x00000060,					/* Target address in NIC Memory */
-		0x0000,						/* CRC: yes/no	TYPE: primary/station/tertiary */
-		(hcf_8 FAR *) fw_image_1_data
+		0x00000060,	/* Target address in NIC Memory */
+		0x0000,		/* CRC: yes/no	TYPE: primary/station/tertiary */
+		(hcf_8 FAR*) fw_image_1_data
 	},
 	{
 		8,
 		CFG_PROG,
 		CFG_PROG_VOLATILE,			/* mode */
 		0x1918,		/* sizeof(fw_image_2_data), */
-		0x00000C16,					/* Target address in NIC Memory */
-		0x0000,						/* CRC: yes/no	TYPE: primary/station/tertiary */
-		(hcf_8 FAR *) fw_image_2_data
+		0x00000C16,	/* Target address in NIC Memory */
+		0x0000,		/* CRC: yes/no	TYPE: primary/station/tertiary */
+		(hcf_8 FAR*) fw_image_2_data
 	},
 	{
 		8,
 		CFG_PROG,
 		CFG_PROG_VOLATILE,			/* mode */
 		0x01bc,		/* sizeof(fw_image_3_data), */
-		0x001E252E,					/* Target address in NIC Memory */
-		0x0000,						/* CRC: yes/no	TYPE: primary/station/tertiary */
-		(hcf_8 FAR *) fw_image_3_data
+		0x001E252E,	/* Target address in NIC Memory */
+		0x0000,		/* CRC: yes/no	TYPE: primary/station/tertiary */
+		(hcf_8 FAR*) fw_image_3_data
 	},
 	{
 		8,
 		CFG_PROG,
 		CFG_PROG_VOLATILE,			/* mode */
 		0xab28,		/* sizeof(fw_image_4_data), */
-		0x001F4000,					/* Target address in NIC Memory */
-		0x0000,						/* CRC: yes/no	TYPE: primary/station/tertiary */
-		(hcf_8 FAR *) fw_image_4_data
+		0x001F4000,	/* Target address in NIC Memory */
+		0x0000,		/* CRC: yes/no	TYPE: primary/station/tertiary */
+		(hcf_8 FAR*) fw_image_4_data
 	},
 	{
 		5,
 		CFG_PROG,
 		CFG_PROG_STOP,				/* mode*/
 		0000,
-	0x000F1297,					/* Start execution address */
+	0x000F1297,		/* Start execution address */
 	},
 	{ 0000, 0000, 0000, 0000, 00000000, 0000, 00000000}
 };
@@ -3301,7 +3301,7 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
 		COMP_ROLE_SUPL,
 		COMP_ID_APF,
 		{
-			{ 2, 2, 4 }  				/* variant, bottom, top */
+			{ 2, 2, 4 }		/* variant, bottom, top */
 		}
 	},
 	{	3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -3309,9 +3309,9 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
 		COMP_ROLE_ACT,
 		COMP_ID_MFI,
 		{
-			{ 4, 6, 7 }, 				/* variant, bottom, top */
-			{ 5, 6, 7 }, 				/* variant, bottom, top */
-			{ 6, 6, 7 }  				/* variant, bottom, top */
+			{ 4, 6, 7 },		/* variant, bottom, top */
+			{ 5, 6, 7 },		/* variant, bottom, top */
+			{ 6, 6, 7 }		/* variant, bottom, top */
 		}
 	},
 	{	3 + ((20 * sizeof(CFG_RANGE_SPEC_STRCT)) / sizeof(hcf_16)),
@@ -3319,14 +3319,16 @@ static const CFG_RANGE20_STRCT fw_image_infocompat[] = {
 		COMP_ROLE_ACT,
 		COMP_ID_CFI,
 		{
-			{ 2, 1, 2 }  				/* variant, bottom, top */
+			{ 2, 1, 2 }		/* variant, bottom, top */
 		}
 	},
-	{ 0000, 0000, 0000, 0000, { { 0000, 0000, 0000 } } }			/* endsentinel */
+	{ 0000, 0000, 0000, 0000,
+		{ { 0000, 0000, 0000 } }
+	}	/* endsentinel */
 };
 
 memimage fw_image = {
-	"FUPU7D37dhfwci\001C",			/* signature, <format number>, C/Bin type */
+	"FUPU7D37dhfwci\001C",	/* signature, <format number>, C/Bin type */
 	(CFG_PROG_STRCT *) fw_image_code,
 	0x000F1297,
 	00000000,					/* (dummy) pdaplug */
-- 
1.7.10.4

Re: [PATCH 1/3] staging: wlags49_h2: ap_h2: fixes coding style issues

[Greg KH]

On Fri, Nov 16, 2012 at 06:52:39PM +0200, Johan Meiring wrote:
> This corrects several instances of spaces before tabs and incorrect spacing around "*" characters.  It also fixes some 80+ character line length issues, but the majority of such cases have been left as is, as this was probably the author's intention.

Please wrap your changelog lines at the properly length (i.e. 72
columns)

Also, please only do one thing per patch.  You are doing multiple things
here, which makes it hard to review.

Same goes for the other patches in this series, please break it up into
smaller steps, which makes for more patches, but it makes it easier to
review to ensure you didn't do something wrong.

Care to redo this and resend it?

thanks,

greg k-h

Re: [PATCH 1/3] staging: wlags49_h2: ap_h2: fixes coding style issues

[Johan Meiring]

Hi Greg,

Thanks for the feedback.  Lesson learned, will remember to do things
in smaller increments and also wrap lines better.

Kindly disregard all three patches.

I'll redo and resend soon :)

Johan

On 16 November 2012 19:05, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Fri, Nov 16, 2012 at 06:52:39PM +0200, Johan Meiring wrote:
>> This corrects several instances of spaces before tabs and incorrect spacing around "*" characters.  It also fixes some 80+ character line length issues, but the majority of such cases have been left as is, as this was probably the author's intention.
>
> Please wrap your changelog lines at the properly length (i.e. 72
> columns)
>
> Also, please only do one thing per patch.  You are doing multiple things
> here, which makes it hard to review.
>
> Same goes for the other patches in this series, please break it up into
> smaller steps, which makes for more patches, but it makes it easier to
> review to ensure you didn't do something wrong.
>
> Care to redo this and resend it?
>
> thanks,
>
> greg k-h

Re: [PATCH 1/3] staging: wlags49_h2: ap_h2: fixes coding style issues

[Dan Carpenter]

On Fri, Nov 16, 2012 at 06:52:39PM +0200, Johan Meiring wrote:
>  		COMP_ID_FW_AP,
> -		2,							/* Variant /
                                                                                  ^^
You fixed a bug here. :) Always mention bugs fixed in the changelog.

> -		2,							/* Major */

regards,
dan carpenter