media: av7110: av7110_av: Fix Switch and Case Same Indent Style Error
Subsystems (2)
PATCH 1/1 media: av7110: av7110_av: Fix Switch and Case Same Indent Style Error
This patch fixes "switch and case should be at the same indent" checkpatch error.
--- drivers/staging/media/av7110/av7110_av.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/media/av7110/av7110_av.c +15 -15
@@ -770,22 +770,22 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,if (length >3 && buf[0 ] ==0x00 && buf[1 ] ==0x00 && buf[2 ] ==0x01 )switch (buf[3 ]) { -case PROG_STREAM_MAP : -case PRIVATE_STREAM2 : -case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : -case ISO13522_STREAM : -case PRIVATE_STREAM1 : - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - pes_start =1 ; -break ; +case PROG_STREAM_MAP : +case PRIVATE_STREAM2 : +case PROG_STREAM_DIR : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM : +case ISO13522_STREAM : +case PRIVATE_STREAM1 : + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E: + pes_start =1 ; +break ; -default : -break ; +default : +break ; }while (c < length) {
Signature · 1 line
2.25.1
Hi Husni,
Thank you for the patch.
The Subject line needs some work: either name the source ('av7110_av.c:') or driver ('av7110:'), but not both. Also just stick to lower case, so:
"media: av7110_av.c: fix switch indentation"
That gives all the relevant information, and is a lot shorter.
Quoted 40 lines · Husni Faiz
This patch fixes "switch and case should be at the same indent" checkpatch error.
Signed-off-by Husni Faiz <[email protected]>--- drivers/staging/media/av7110/av7110_av.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)drivers/staging/media/av7110/av7110_av.c +11
-13@@ -770,22 +770,22 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,if (length >3 && buf[0 ] ==0x00 && buf[1 ] ==0x00 && buf[2 ] ==0x01 )switch (buf[3 ]) { -case PROG_STREAM_MAP : -case PRIVATE_STREAM2 : -case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : -case ISO13522_STREAM : -case PRIVATE_STREAM1 : - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - pes_start =1 ; -break ; +case PROG_STREAM_MAP : +case PRIVATE_STREAM2 : +case PROG_STREAM_DIR : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM : +case ISO13522_STREAM : +case PRIVATE_STREAM1 : + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E:
drivers/staging/media/av7110/av7110_av.c static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, · line 791
Quoted 10 lines
drivers/staging/media/av7110/av7110_av.c +4
-2+ pes_start =1 ; +break ; -default : -break ; +default : +break ; }while (c < length) {
Running checkpatch.pl over this patch give me:
ERROR: space prohibited before that ':' (ctx:WxE) #40: FILE: drivers/staging/media/av7110/av7110_av.c:776:
+ case ECM_STREAM :
^
ERROR: space prohibited before that ':' (ctx:WxE) #41: FILE: drivers/staging/media/av7110/av7110_av.c:777:
+ case EMM_STREAM :
^
ERROR: space prohibited before that ':' (ctx:WxE) #42: FILE: drivers/staging/media/av7110/av7110_av.c:778:
+ case PADDING_STREAM :
^
ERROR: space prohibited before that ':' (ctx:WxE) #43: FILE: drivers/staging/media/av7110/av7110_av.c:779:
+ case DSM_CC_STREAM :
^
Can you fix that as well in a v2 of this patch?
Thanks!
Hans
Hello Hans,
Quoted 10 lines · Hans Verkuil
Hi Husni,
Thank you for the patch.
The Subject line needs some work: either name the source ('
av7110_av.c:') or driver ('av7110:'), but not both. Also just stick to lower case, so:
"media:av7110_av.c: fix switch indentation"That gives all the relevant information, and is a lot shorter.
Noted with thanks. I'll update the subject line in the V2 of the patch.
Quoted 68 lines · Husni Faiz
Quoted 40 lines
This patch fixes "switch and case should be at the same indent" checkpatch error.
Signed-off-by Husni Faiz <[email protected]>--- drivers/staging/media/av7110/av7110_av.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)drivers/staging/media/av7110/av7110_av.c +11
-13@@ -770,22 +770,22 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,if (length >3 && buf[0 ] ==0x00 && buf[1 ] ==0x00 && buf[2 ] ==0x01 )switch (buf[3 ]) { -case PROG_STREAM_MAP : -case PRIVATE_STREAM2 : -case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : -case ISO13522_STREAM : -case PRIVATE_STREAM1 : - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - pes_start =1 ; -break ; +case PROG_STREAM_MAP : +case PRIVATE_STREAM2 : +case PROG_STREAM_DIR : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM : +case ISO13522_STREAM : +case PRIVATE_STREAM1 : + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E:drivers/staging/media/av7110/av7110_av.c static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, · line 791
Quoted 10 lines
drivers/staging/media/av7110/av7110_av.c +4
-2+ pes_start =1 ; +break ; -default : -break ; +default : +break ; }while (c < length) {Running checkpatch.pl over this patch give me:
ERROR: space prohibited before that ':' (ctx:WxE) #40: FILE:
drivers/staging/media/av7110/av7110_av.c:776:
+ caseECM_STREAM:^ERROR: space prohibited before that ':' (ctx:WxE) #41: FILE:
drivers/staging/media/av7110/av7110_av.c:777:
+ caseEMM_STREAM:^ERROR: space prohibited before that ':' (ctx:WxE) #42: FILE:
drivers/staging/media/av7110/av7110_av.c:778:
+ casePADDING_STREAM:
Quoted 7 lines
^ERROR: space prohibited before that ':' (ctx:WxE) #43: FILE:
drivers/staging/media/av7110/av7110_av.c:779:
+ caseDSM_CC_STREAM:^Can you fix that as well in a v2 of this patch?
It seems that these spaces are deliberately added by the author to keep the case statements' colons aligned.
Some other lines in the file where the same approach has been taken are [line 598,599,600,601] and [line 662, 663, 664, 665]. Should we leave these spaces as it is?
Thanks,
Husni.
Quoted 90 lines · Ahamed Husni
Hello Hans,
Quoted 10 lines · Hans Verkuil
Hi Husni,
Thank you for the patch.
The Subject line needs some work: either name the source ('
av7110_av.c:') or driver ('av7110:'), but not both. Also just stick to lower case, so:
"media:av7110_av.c: fix switch indentation"That gives all the relevant information, and is a lot shorter.
Noted with thanks. I'll update the subject line in the V2 of the patch.
Quoted 68 lines · Husni Faiz
Quoted 40 lines
This patch fixes "switch and case should be at the same indent" checkpatch error.
Signed-off-by Husni Faiz <[email protected]>--- drivers/staging/media/av7110/av7110_av.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)drivers/staging/media/av7110/av7110_av.c +11
-13@@ -770,22 +770,22 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,if (length >3 && buf[0 ] ==0x00 && buf[1 ] ==0x00 && buf[2 ] ==0x01 )switch (buf[3 ]) { -case PROG_STREAM_MAP : -case PRIVATE_STREAM2 : -case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : -case ISO13522_STREAM : -case PRIVATE_STREAM1 : - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - pes_start =1 ; -break ; +case PROG_STREAM_MAP : +case PRIVATE_STREAM2 : +case PROG_STREAM_DIR : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM : +case ISO13522_STREAM : +case PRIVATE_STREAM1 : + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E:drivers/staging/media/av7110/av7110_av.c static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter, · line 791
Quoted 10 lines
drivers/staging/media/av7110/av7110_av.c +4
-2+ pes_start =1 ; +break ; -default : -break ; +default : +break ; }while (c < length) {Running checkpatch.pl over this patch give me:
ERROR: space prohibited before that ':' (ctx:WxE) #40: FILE:
drivers/staging/media/av7110/av7110_av.c:776:
+ caseECM_STREAM:^ERROR: space prohibited before that ':' (ctx:WxE) #41: FILE:
drivers/staging/media/av7110/av7110_av.c:777:
+ caseEMM_STREAM:^ERROR: space prohibited before that ':' (ctx:WxE) #42: FILE:
drivers/staging/media/av7110/av7110_av.c:778:
+ casePADDING_STREAM:Quoted 7 lines
^ERROR: space prohibited before that ':' (ctx:WxE) #43: FILE:
drivers/staging/media/av7110/av7110_av.c:779:
+ caseDSM_CC_STREAM:^Can you fix that as well in a v2 of this patch?
Quoted 5 lines
It seems that these spaces are deliberately added by the author to keep the case statements' colons aligned.
Some other lines in the file where the same approach has been taken are [line 598,599,600,601] and [line 662, 663, 664, 665]. Should we leave these spaces as it is?
Either just fix it here, or post a second patch that removes the spaces throughout this driver. It's a very old driver, predating the much more strict enforcement of coding style that we have today.
Regards,
Hans
Quoted 3 lines
Thanks,
Husni.
Hello Hans,
Quoted 3 lines
Either just fix it here, or post a second patch that removes the spaces throughout this driver. It's a very old driver, predating the much more strict enforcement of coding style that we have today.
I have sent the fix as two seperate patches. Please have a look.
https://lore.kernel.org/linux-staging/[email protected]/T/#t
Thanks,
Husni.
PATCH v2 1/2 media: av7110: fix switch indentation
In reply to Husni FaizThis patch fixes "switch and case should be at the same indent" checkpatch error.
---V1->V2: Add a clear subject line to the patch.
drivers/staging/media/av7110/av7110_av.c | 30 ++++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/staging/media/av7110/av7110_av.c +15 -15
@@ -770,22 +770,22 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,if (length >3 && buf[0 ] ==0x00 && buf[1 ] ==0x00 && buf[2 ] ==0x01 )switch (buf[3 ]) { -case PROG_STREAM_MAP : -case PRIVATE_STREAM2 : -case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : -case ISO13522_STREAM : -case PRIVATE_STREAM1 : - case AUDIO_STREAM_S ... AUDIO_STREAM_E: - case VIDEO_STREAM_S ... VIDEO_STREAM_E: - pes_start =1 ; -break ; +case PROG_STREAM_MAP : +case PRIVATE_STREAM2 : +case PROG_STREAM_DIR : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM : +case ISO13522_STREAM : +case PRIVATE_STREAM1 : + case AUDIO_STREAM_S ... AUDIO_STREAM_E: + case VIDEO_STREAM_S ... VIDEO_STREAM_E: + pes_start =1 ; +break ; -default : -break ; +default : +break ; }while (c < length) {
Signature · 1 line
2.25.1
PATCH v2 2/2 media: av7110: fix prohibited spaces in switch statement
This patch fixes "space prohibited before that ':'" checkpatch error in the switch statements.
---V1->V2: Prohibited space fix after patch review.
drivers/staging/media/av7110/av7110_av.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-)
drivers/staging/media/av7110/av7110_av.c +12 -12
@@ -595,10 +595,10 @@ static int find_pes_header(u8 const *buf, long int length, int *frags)case PROG_STREAM_MAP :case PRIVATE_STREAM2 :case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM :case ISO13522_STREAM :case PRIVATE_STREAM1 : case AUDIO_STREAM_S ... AUDIO_STREAM_E:
@@ -659,10 +659,10 @@ void av7110_p2t_write(u8 const *buf, long int length, u16 pid, struct av7110_p2tcase PROG_STREAM_MAP :case PRIVATE_STREAM2 :case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM :case ISO13522_STREAM :case PRIVATE_STREAM1 : case AUDIO_STREAM_S ... AUDIO_STREAM_E:
@@ -773,10 +773,10 @@ static void p_to_t(u8 const *buf, long int length, u16 pid, u8 *counter,case PROG_STREAM_MAP :case PRIVATE_STREAM2 :case PROG_STREAM_DIR : -case ECM_STREAM : -case EMM_STREAM : -case PADDING_STREAM : -case DSM_CC_STREAM : +case ECM_STREAM : +case EMM_STREAM : +case PADDING_STREAM : +case DSM_CC_STREAM :case ISO13522_STREAM :case PRIVATE_STREAM1 : case AUDIO_STREAM_S ... AUDIO_STREAM_E:
Signature · 1 line
2.25.1
Re: [PATCH v2 1/2] media: av7110: fix switch indentation
In reply to Husni FaizPing :)