Staging: rtl8188eu: Fixed coding style issues

PATCH Superseded Tim Jester-Pfadt 4 participants 7 messages Jan 2, 2014 – Jan 3, 2014 Staging

lore

Share & tools

lore

Tim Jester-Pfadt

author

2014-01-02 20:47 UTC #0 lore raw

PATCH v2 1/1 Staging: rtl8188eu: Fixed coding style issues

Fixed indentation coding style issues on rtw_io.c

Signed-off-by Tim Jester-Pfadt <[email protected]>

---
 drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/staging/rtl8188eu/core/rtw_io.c +6 -6

index 10c9c65..6be6c50 100644
@@ -205,9 +205,9 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
 	_func_enter_;
 	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			adapter->bDriverStopped, adapter->bSurpriseRemoved));
 	     return;
 	}
 	_read_mem = pintfhdl->io_ops._read_mem;

@@ -239,9 +239,9 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 	_func_enter_;
 
 	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			adapter->bDriverStopped, adapter->bSurpriseRemoved));
 	     return;
 	}

Signature · 1 line

1.8.5.2

Larry Finger

2014-01-02 21:37 UTC #1 lore raw

Quoted 12 lines · Tim Jester-Pfadt

Fixed indentation coding style issues on rtw_io.c
Signed-off-by Tim Jester-Pfadt <[email protected]>
---
  drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_io.c +0 -0
index 10c9c65..6be6c50 100644

drivers/staging/rtl8188eu/core/rtw_io.c void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) · line 210

Quoted 9 lines

drivers/staging/rtl8188eu/core/rtw_io.c +3 -3

@@ -205,9 +205,9 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
  	_func_enter_;
  	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			adapter->bDriverStopped, adapter->bSurpriseRemoved));

The latest version of checkpatch.pl lists the following:

CHECK: Alignment should match open parenthesis #87: FILE: drivers/staging/rtl8188eu/core/rtw_io.c:207:
+ RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+ ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",

The continuing lines should be indented one more space.

Larry

Tim Jester-Pfadt

author

2014-01-02 23:23 UTC #2 lore raw

PATCH v3 1/1 Staging: rtl8188eu: Fixed coding style issues

In reply to Tim Jester-Pfadt

Fixed indentation coding style issues on rtw_io.c

Signed-off-by Tim Jester-Pfadt <[email protected]>

---
 drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

drivers/staging/rtl8188eu/core/rtw_io.c +6 -6

index 10c9c65..f1b8dfe 100644
@@ -205,9 +205,9 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
 	_func_enter_;
 	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			 ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			 adapter->bDriverStopped, adapter->bSurpriseRemoved));
 	     return;
 	}
 	_read_mem = pintfhdl->io_ops._read_mem;

@@ -239,9 +239,9 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 	_func_enter_;
 
 	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			 ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			 adapter->bDriverStopped, adapter->bSurpriseRemoved));
 	     return;
 	}

Signature · 1 line

1.8.5.2

Larry Finger

Acked-by on v3 1/1

2014-01-02 23:33 UTC #3 lore raw

Quoted 26 lines · Tim Jester-Pfadt

Fixed indentation coding style issues on rtw_io.c

Signed-off-by Tim Jester-Pfadt <[email protected]>

---
  drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)

drivers/staging/rtl8188eu/core/rtw_io.c +3 -3

index 10c9c65..f1b8dfe 100644
@@ -205,9 +205,9 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
  	_func_enter_;
  	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			 ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			 adapter->bDriverStopped, adapter->bSurpriseRemoved));
  	     return;
  	}
  	_read_mem = pintfhdl->io_ops._read_mem;

@@ -239,9 +239,9 @@ void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
  	_func_enter_;

drivers/staging/rtl8188eu/core/rtw_io.c void _rtw_read_port(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) · line 246

Quoted 10 lines

drivers/staging/rtl8188eu/core/rtw_io.c +3 -3

 
  	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			 ("rtw_read_port:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			 adapter->bDriverStopped, adapter->bSurpriseRemoved));
  	     return;
  	}

Acked-by Larry Finger <[email protected]>

Thanks,

Larry

Joe Perches

2014-01-03 03:58 UTC #4 lore raw

In reply to Tim Jester-Pfadt

Quoted 1 line · Tim Jester-Pfadt

Fixed indentation coding style issues on rtw_io.c

[]

drivers/staging/rtl8188eu/core/rtw_io.c

Quoted 1 line

drivers/staging/rtl8188eu/core/rtw_io.c +0 -0

[]

drivers/staging/rtl8188eu/core/rtw_io.c void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem) · line 210

Quoted 10 lines

drivers/staging/rtl8188eu/core/rtw_io.c +3 -3

@@ -205,9 +205,9 @@ void _rtw_read_mem(struct adapter *adapter, u32 addr, u32 cnt, u8 *pmem)
 
 	_func_enter_;
 	if (adapter->bDriverStopped || adapter->bSurpriseRemoved) {
-	     RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
-		      ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
-		      adapter->bDriverStopped, adapter->bSurpriseRemoved));
+		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
+			 ("rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
+			 adapter->bDriverStopped, adapter->bSurpriseRemoved));

Be nice to remove the unnecessary parentheses on all of these too

		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
			 "rtw_read_mem:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
			 adapter->bDriverStopped, adapter->bSurpriseRemoved);

etc...

A few other things too:

o The _func_enter_ uses are unnecessary and could/should be removed. There's a standard function tracing capability.
o The RT_TRACE uses that embed a function name could/should use %s:, __func__
o The RT_TRACE macro doesn't add a terminating newline and these uses should have them.

		RT_TRACE(_module_rtl871x_io_c_, _drv_info_,
			 "%s:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n",
			 __func__, adapter->bDriverStopped, adapter->bSurpriseRemoved);

Dan Carpenter

2014-01-03 07:55 UTC #5 lore raw

In reply to Tim Jester-Pfadt

Quoted 4 lines · Tim Jester-Pfadt

Fixed indentation coding style issues on rtw_io.c
Signed-off-by Tim Jester-Pfadt <[email protected]>
---

Next time, if you do a v2 patch please put a note here under the --- line what changed between the previous one and this one.

2: changed blah blah blah.

Quoted 2 lines

 drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

regards,
dan carpenter

Tim Jester-Pfadt

author

2014-01-03 12:09 UTC #6 lore raw

Thank you for your feedback.
I'm still figuring stuff out. Submitting patches to the kernel has been my new year's resolution.

Regards,

Tim

2014/1/3 Dan Carpenter <[email protected]>:

Quoted 17 lines · Tim Jester-Pfadt

Quoted 4 lines
Fixed indentation coding style issues on rtw_io.c
Signed-off-by Tim Jester-Pfadt <[email protected]>
---
Next time, if you do a v2 patch please put a note here under the --- line what changed between the previous one and this one.
2: changed blah blah blah.
Quoted 2 lines
 drivers/staging/rtl8188eu/core/rtw_io.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
regards,
dan carpenter