staging: atomisp: fix block comment style in refcount.c
Subsystems (4)
PATCH 1/1 staging: atomisp: fix block comment style in refcount.c
Fix block comment formatting to comply with kernel coding style:
- Add leading '*' on continuation lines
- Move trailing '*/' to a separate line
- Remove unnecessary braces around single statement block
--- .../atomisp/pci/base/refcount/src/refcount.c | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-)
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +16 -13
@@ -16,7 +16,8 @@#include "ia_css_debug.h" /* TODO: enable for other memory aswell -now only for ia_css_ptr */ +* now only for ia_css_ptr +*/ struct ia_css_refcount_entry {u32 count;ia_css_ptr data;
@@ -93,14 +94,15 @@ void ia_css_refcount_uninit(void) "%s() entry\n", __func__);for (i =0 ; i < myrefcount.size; i++) {/* driver verifier tool has issues with &arr[i] -and prefers arr + i; as these are actually equivalent -the line below uses + i -*/ +* and prefers arr + i; as these are actually equivalent +* the line below uses + i +*/ entry = myrefcount.items + i;if (entry->data != mmgr_NULL) {/* ia_css_debug_dtrace(IA_CSS_DBG_TRACE, -"ia_css_refcount_uninit: freeing (%x)\n", -entry->data);*/ +* "ia_css_refcount_uninit: freeing (%x)\n", +* entry->data); +*/ hmm_free (entry->data); entry->data = mmgr_NULL; entry->count =0 ;
@@ -173,7 +175,8 @@ bool ia_css_refcount_decrement(s32 id, ia_css_ptr ptr) entry->count -=1 ;if (entry->count ==0 ) {/* ia_css_debug_dtrace(IA_CSS_DBEUG_TRACE, -"ia_css_refcount_decrement: freeing\n");*/ +* "ia_css_refcount_decrement: freeing\n"); +*/ hmm_free (ptr); entry->data = mmgr_NULL; entry->id =0 ;
@@ -183,7 +186,8 @@ bool ia_css_refcount_decrement(s32 id, ia_css_ptr ptr) }/* SHOULD NOT HAPPEN: ptr not managed by refcount, or not -valid anymore */ +* valid anymore +*/ if (entry)IA_CSS_ERROR ("id %x, ptr 0x%x entry %p entry->id %x entry->count %d\n" , id, ptr, entry, entry->id, entry->count);
@@ -221,9 +225,9 @@ void ia_css_refcount_clear(s32 id, clear_func clear_func_ptr)for (i =0 ; i < myrefcount.size; i++) {/* driver verifier tool has issues with &arr[i] -and prefers arr + i; as these are actually equivalent -the line below uses + i -*/ +* and prefers arr + i; as these are actually equivalent +* the line below uses + i +*/ entry = myrefcount.items + i;if ((entry->data != mmgr_NULL) && (entry->id == id)) { ia_css_debug_dtrace(IA_CSS_DEBUG_TRACE,
@@ -238,9 +242,8 @@ void ia_css_refcount_clear(s32 id, clear_func clear_func_ptr)hmm_free (entry->data); } -if (entry->count !=0 ) { +if (entry->count !=0 )IA_CSS_WARNING ("Ref count for entry %x is not zero!" , entry->id); - }assert (entry->count ==0 );
Signature · 1 line
2.43.0
Quoted 4 lines · Oskar Ray-Frayssinet
Fix block comment formatting to comply with kernel coding style:
- Add leading '*' on continuation lines
- Move trailing '*/' to a separate line
- Remove unnecessary braces around single statement block
Are they the only ones to fix in the entire driver?
...
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c line 20
Quoted 4 lines
/* TODO: enable for other memory aswell
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +2
-1-now only for ia_css_ptr */ +* now only for ia_css_ptr +*/
/*
* Please, fix them in a better
* way as depicted by this comment.
*/
...
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c void ia_css_refcount_uninit(void) · line 105
Quoted 6 lines
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +3
-2/* ia_css_debug_dtrace(IA_CSS_DBG_TRACE, -"ia_css_refcount_uninit: freeing (%x)\n", -entry->data);*/ +* "ia_css_refcount_uninit: freeing (%x)\n", +* entry->data); +*/
No, instead use #if 0 ... #endif. Or even better if you find any existing compile-time definition for that (instead of 0).
...
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c bool ia_css_refcount_decrement(s32 id, ia_css_ptr ptr) · line 179
Quoted 4 lines
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +2
-1/* ia_css_debug_dtrace(IA_CSS_DBEUG_TRACE, -"ia_css_refcount_decrement: freeing\n");*/ +* "ia_css_refcount_decrement: freeing\n"); +*/
Ditto.
...
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c void ia_css_refcount_clear(s32 id, clear_func clear_func_ptr) · line 243
Quoted 4 lines
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +1
-2-if (entry->count !=0 ) { +if (entry->count !=0 )IA_CSS_WARNING ("Ref count for entry %x is not zero!" , entry->id); - }
Make this to be a separate patch, and find more occurrences of a such.
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v2 1/1 staging: media: atomisp: fix block comment style in refcount.c
In reply to Oskar Ray-FrayssinetFix block comment formatting to comply with kernel coding style:
- Move text from opening '/*' line to a separate continuation line
- Add leading '*' on continuation lines
- Move trailing '*/' to a separate line
- Replace commented-out code with #if 0 ... #endif blocks
--- .../atomisp/pci/base/refcount/src/refcount.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
drivers/staging/media/atomisp/pci/base/refcount/src/refcount.c +11 -8
@@ -15,7 +15,8 @@#include "ia_css_debug.h" -/* TODO: enable for other memory aswell +/* +* TODO: enable for other memory aswell * now only for ia_css_ptr */ struct ia_css_refcount_entry {
@@ -99,10 +100,11 @@ void ia_css_refcount_uninit(void)*/ entry = myrefcount.items + i;if (entry->data != mmgr_NULL) { -/* ia_css_debug_dtrace(IA_CSS_DBG_TRACE, -* "ia_css_refcount_uninit: freeing (%x)\n", -* entry->data); -*/ +#if 0 +ia_css_debug_dtrace (IA_CSS_DBG_TRACE , +"ia_css_refcount_uninit: freeing (%x)\n" , + entry->data); +#endif hmm_free (entry->data); entry->data = mmgr_NULL; entry->count =0 ;
@@ -174,9 +176,10 @@ bool ia_css_refcount_decrement(s32 id, ia_css_ptr ptr)if (entry->count >0 ) { entry->count -=1 ;if (entry->count ==0 ) { -/* ia_css_debug_dtrace(IA_CSS_DBEUG_TRACE, -* "ia_css_refcount_decrement: freeing\n"); -*/ +#if 0 +ia_css_debug_dtrace (IA_CSS_DBEUG_TRACE , +"ia_css_refcount_decrement: freeing\n" ); +#endif hmm_free (ptr); entry->data = mmgr_NULL; entry->id =0 ;
Signature · 1 line
2.43.0
Re: [PATCH v2] staging: media: atomisp: fix block comment style in refcount.c
Quoted 6 lines · Oskar Ray-Frayssinet
Fix block comment formatting to comply with kernel coding style:
- Move text from opening '/*' line to a separate continuation line
- Add leading '*' on continuation lines
- Move trailing '*/' to a separate line- Replace commented-out code with #if 0 ... #endif blocks
This should be done in a separate patch as this is not about comments.
Quoted 2 lines
Signed-off-by Oskar Ray-Frayssinet <[email protected]>---
Where is the changelog?
Signature · 2 lines
With Best Regards, Andy Shevchenko