staging: media: meson: vdec: declare u32 as const and static const
Subsystems (4)
PATCH v2 1/1 staging: media: meson: vdec: declare u32 as const and static const
Declared 32 bit unsigned int as static constant inside a function and replaced u32[] {x,y} as canvas1, canvas2 in codec_mpeg12.c
This indicates the value of canvas indexes will remain constant throughout execution. Replaced u32 reg_base and u32 reg_name with const u32 reg_base and const u32 reg_name as it will contain data/registry bases to write static const indexes declared above and will keep track of of contiguos registers after each reg_base.
This makes code look better, neater. It improves readability.
--- 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);
Signature · 1 line
2.30.2
Quoted 9 lines · Mitali Borkar
Declared 32 bit unsigned int as static constant inside a function and replaced u32[] {x,y} as canvas1, canvas2 in
codec_mpeg12.c
This indicates the value of canvas indexes will remain constant throughout execution. Replaced u32reg_baseand u32reg_namewith const u32reg_baseand const u32reg_nameas it will contain data/registry bases to write static const indexes declared above and will keep track of of contiguos registers after eachreg_base.
This makes code look better, neater. It improves readability.
Quoted 3 lines
Signed-off-by Mitali Borkar <[email protected]>--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 5 +++--
Also change drivers/staging/media/meson/vdec/codec_h264.c.
It's a nice improvement, so let's do this for both callers of amvdec_set_canvases().
Regards,
Hans
Quoted 54 lines
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);
Quoted 10 lines · Hans Verkuil
Quoted 9 lines · Mitali Borkar
Declared 32 bit unsigned int as static constant inside a function and replaced u32[] {x,y} as canvas1, canvas2 in
codec_mpeg12.c
This indicates the value of canvas indexes will remain constant throughout execution. Replaced u32reg_baseand u32reg_namewith const u32reg_baseand const u32reg_nameas it will contain data/registry bases to write static const indexes declared above and will keep track of of contiguos registers after eachreg_base.
This makes code look better, neater. It improves readability.
Quoted 8 lines
Quoted 3 lines
Signed-off-by Mitali Borkar <[email protected]>--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 5 +++--Also change
drivers/staging/media/meson/vdec/codec_h264.c.It's a nice improvement, so let's do this for both callers of
amvdec_set_canvases().
I have done chnages in codec_h264.c Now, should I send that as new patch?
Quoted 59 lines
Regards,
Hans
Quoted 54 lines
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);
Quoted 15 lines · Mitali Borkar
Quoted 14 lines · Hans Verkuil
Quoted 12 lines · Mitali Borkar
Declared 32 bit unsigned int as static constant inside a function and replaced u32[] {x,y} as canvas1, canvas2 in
codec_mpeg12.c
This indicates the value of canvas indexes will remain constant throughout execution. Replaced u32reg_baseand u32reg_namewith const u32reg_baseand const u32reg_nameas it will contain data/registry bases to write static const indexes declared above and will keep track of of contiguos registers after eachreg_base.
This makes code look better, neater. It improves readability.Signed-off-by Mitali Borkar <[email protected]>--- drivers/staging/media/meson/vdec/codec_mpeg12.c | 5 +++--
Quoted 6 lines
Quoted 4 lines
Also change
drivers/staging/media/meson/vdec/codec_h264.c.It's a nice improvement, so let's do this for both callers of
amvdec_set_canvases().I have done chnages in
codec_h264.cNow, should I send that as new patch?
Yes please,
Neil
Quoted 60 lines
Quoted 60 lines
Regards,
Hans
Quoted 54 lines
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);