staging: media: meson: vdec: matched alignment with parenthesis
Subsystems (4)
PATCH 1/1 staging: media: meson: vdec: matched alignment with parenthesis
Matched alignment with open parenthesis to meet linux kernel coding style.
Reported by checkpatch
--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/meson/vdec/codec_mpeg12.c +1 -1
@@ -81,7 +81,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess) } ret =amvdec_set_canvases (sess, (u32 []){AV_SCRATCH_0 ,0 }, - (u32 []){8 ,0 }); + (u32 []){8 ,0 });if (ret) goto free_workspace;
Signature · 1 line
2.30.2
Quoted 14 lines · Mitali Borkar
Matched alignment with open parenthesis to meet linux kernel coding style.
Reported by checkpatchSigned-off-by Mitali Borkar <[email protected]>--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/media/meson/vdec/codec_mpeg12.c +0
-0
drivers/staging/media/meson/vdec/codec_mpeg12.c static int codec_mpeg12_start(struct amvdec_session *sess) · line 84
Quoted 5 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c +1
-1@@ -81,7 +81,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess) } ret =amvdec_set_canvases (sess, (u32 []){AV_SCRATCH_0 ,0 }, - (u32 []){8 ,0 }); + (u32 []){8 ,0 });
The alignment here is because the 2nd and 3rd arguments belong together, so the alignment indicates that. In order to keep that I would add a newline after 'sess,' as well. Same as is done in meson/vdec/codec_h264.c.
Regards,
Hans
Quoted 4 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c +0
-0if (ret) goto free_workspace;
Quoted 18 lines · Hans Verkuil
Quoted 17 lines · Mitali Borkar
Matched alignment with open parenthesis to meet linux kernel coding style.
Reported by checkpatchSigned-off-by Mitali Borkar <[email protected]>---
�drivers/staging/media/meson/vdec/codec_mpeg12.c | 2 +- �1 file changed, 1 insertion(+), 1 deletion(-)drivers/staging/media/meson/vdec/codec_mpeg12.c +0
-0@@ -81,7 +81,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess) � }�
Quoted 7 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c
Quoted 3 lines
� ret = amvdec_set_canvases(sess, (u32[]){
AV_SCRATCH_0, 0 },drivers/staging/media/meson/vdec/codec_mpeg12.c +1
-1- (u32[]){ 8, 0 }); + (u32[]){ 8, 0 });The alignment here is because the 2nd and 3rd arguments belong together, so the alignment indicates that. In order to keep that I would add a newline after 'sess,' as well. Same as is done in
meson/vdec/codec_h264.c.
Perhaps better as:
--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 5 +++-- drivers/staging/media/meson/vdec/vdec_helpers.c | 2 +- drivers/staging/media/meson/vdec/vdec_helpers.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)
drivers/staging/media/meson/vdec/codec_mpeg12.c +3 -2
@@ -65,6 +65,8 @@ static int codec_mpeg12_start(struct amvdec_session *sess)struct amvdec_core *core = sess->core;struct codec_mpeg12 *mpeg12;int ret; +static const u32 canvas1[] = {AV_SCRATCH_0 ,0 }; +static const u32 canvas2[] = {8 ,0 }; mpeg12 =kzalloc (sizeof (*mpeg12),GFP_KERNEL );if (!mpeg12)
@@ -80,8 +82,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess) goto free_mpeg12; } - ret =amvdec_set_canvases (sess, (u32 []){AV_SCRATCH_0 ,0 }, - (u32 []){8 ,0 }); + ret =amvdec_set_canvases (sess, canvas1, canvas2);if (ret) goto free_workspace;
drivers/staging/media/meson/vdec/vdec_helpers.c +1 -1
@@ -177,7 +177,7 @@ static int set_canvas_nv12m(struct amvdec_session *sess, }int amvdec_set_canvases (struct amvdec_session *sess, -u32 reg_base[],u32 reg_num[]) +const u32 reg_base[],const u32 reg_num[]) {struct v4l2_m2m_buffer *buf;u32 pixfmt = sess->pixfmt_cap;
drivers/staging/media/meson/vdec/vdec_helpers.h +1 -1
@@ -17,7 +17,7 @@* @reg_num: number of contiguous registers after each reg_base (including it) */ int amvdec_set_canvases (struct amvdec_session *sess, -u32 reg_base[],u32 reg_num[]); +const u32 reg_base[],const u32 reg_num[]);/* Helpers to read/write to the various IPs (DOS, PARSER) */ u32 amvdec_read_dos (struct amvdec_core *core,u32 reg);
Looks good, will try this.
Quoted 96 lines · On Fri, 9 Apr, 2021, 14:10 Joe Perches, <[email protected]> wrote:
Quoted 11 lines · Hans Verkuil
Review
Quoted 10 lines · Mitali Borkar
Matched alignment with open parenthesis to meet linux kernel coding style.
Reported by checkpatchSigned-off-by Mitali Borkar <[email protected]>--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)(quoted diff) +0
-0
b/drivers/staging/media/meson/vdec/codec_mpeg12.cQuoted 4 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c static int codec_mpeg12_start(struct amvdec_session
Quoted 4 lines
index
48869cc3d973..21e93a13356c100644drivers/staging/media/meson/vdec/codec_mpeg12.c +0
-0@@ -81,7 +81,7 @@ static int codec_mpeg12_start(struct amvdec_session*sess)
Quoted 8 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c static int codec_mpeg12_start(struct amvdec_session *sess)
Quoted 6 lines
drivers/staging/media/meson/vdec/codec_mpeg12.c +1
-1} ret =amvdec_set_canvases (sess, (u32 []){AV_SCRATCH_0 ,0 }, - (u32 []){8 ,0 }); + (u32 []){8 ,0 });The alignment here is because the 2nd and 3rd arguments belong together,
so
Quoted 2 lines
the alignment indicates that. In order to keep that I would add a newline after 'sess,' as well. Same as is done in
meson/vdec/codec_h264.c.Perhaps better as:
--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 5 +++-- drivers/staging/media/meson/vdec/vdec_helpers.c | 2 +- drivers/staging/media/meson/vdec/vdec_helpers.h | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-)drivers/staging/media/meson/vdec/codec_mpeg12.c +2
-0@@ -65,6 +65,8 @@ static int codec_mpeg12_start(struct amvdec_session *sess)struct amvdec_core *core = sess->core;struct codec_mpeg12 *mpeg12;int ret; +static const u32 canvas1[] = {AV_SCRATCH_0 ,0 }; +static const u32 canvas2[] = {8 ,0 }; mpeg12 =kzalloc (sizeof (*mpeg12),GFP_KERNEL );if (!mpeg12)drivers/staging/media/meson/vdec/codec_mpeg12.c +1
-2@@ -80,8 +82,7 @@ static int codec_mpeg12_start(struct amvdec_session *sess) goto free_mpeg12; } - ret =amvdec_set_canvases (sess, (u32 []){AV_SCRATCH_0 ,0 }, - (u32 []){8 ,0 }); + ret =amvdec_set_canvases (sess, canvas1, canvas2);if (ret) goto free_workspace;drivers/staging/media/meson/vdec/vdec_helpers.c +1
-1@@ -177,7 +177,7 @@ static int set_canvas_nv12m(struct amvdec_session *sess, }int amvdec_set_canvases (struct amvdec_session *sess, -u32 reg_base[],u32 reg_num[]) +const u32 reg_base[],const u32 reg_num[]) {struct v4l2_m2m_buffer *buf;u32 pixfmt = sess->pixfmt_cap;drivers/staging/media/meson/vdec/vdec_helpers.h +1
-1@@ -17,7 +17,7 @@* @reg_num: number of contiguous registers after each reg_base (including it) */ int amvdec_set_canvases (struct amvdec_session *sess, -u32 reg_base[],u32 reg_num[]); +const u32 reg_base[],const u32 reg_num[]);/* Helpers to read/write to the various IPs (DOS, PARSER) */ u32
amvdec_read_dos(struct amvdec_core *core, u32 reg);
Martin Blumenstingl
reviewerQuoted 2 lines · Mitali Borkar
Looks good, will try this.
if you re-send this patch then please include our mailing list:
[email protected]
Thank you!
Martin