media: v4l2-tpg: Remove unused tpg_fillbuffer
PATCH 1/1 media: v4l2-tpg: Remove unused tpg_fillbuffer
From: "Dr. David Alan Gilbert" <[email protected]>
The last use of tpg_fillbuffer() was removed in 2015 by commit ddcaee9dd4c0 ("[media] vivid: add support for single buffer planar formats")
Remove it.
--- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 17 ----------------- include/media/tpg/v4l2-tpg.h | 2 -- 2 files changed, 19 deletions(-)
drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +0 -17
@@ -2710,23 +2710,6 @@ void tpg_fill_plane_buffer(struct tpg_data *tpg, v4l2_std_id std, }EXPORT_SYMBOL_GPL (tpg_fill_plane_buffer); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf) -{ -unsigned offset =0 ; -unsigned i; - -if (tpg->buffers >1 ) { -tpg_fill_plane_buffer (tpg, std, p, vbuf); -return ; - } - -for (i =0 ; i <tpg_g_planes (tpg); i++) { -tpg_fill_plane_buffer (tpg, std, i, vbuf + offset); - offset +=tpg_calc_plane_size (tpg, i); - } -} -EXPORT_SYMBOL_GPL (tpg_fillbuffer); -MODULE_DESCRIPTION ("V4L2 Test Pattern Generator" );MODULE_AUTHOR ("Hans Verkuil" );MODULE_LICENSE ("GPL" );
include/media/tpg/v4l2-tpg.h +0 -2
@@ -248,8 +248,6 @@ void tpg_calc_text_basep(struct tpg_data *tpg,unsigned tpg_g_interleaved_plane (const struct tpg_data *tpg,unsigned buf_line);void tpg_fill_plane_buffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std, -unsigned p,u8 *vbuf);bool tpg_s_fourcc (struct tpg_data *tpg,u32 fourcc);void tpg_s_crop_compose (struct tpg_data *tpg,const struct v4l2_rect *crop,const struct v4l2_rect *compose);
Signature · 1 line
2.49.0
Quoted 7 lines · On 04/06/2025 00:51, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
The last use of
tpg_fillbuffer()was removed in 2015 by commitddcaee9dd4c0("[media] vivid: add support for single buffer planar formats")Remove it.
Ah, this can't be removed.
This tpg code is actually also used in git://linuxtv.org/v4l-utils.git which copies the code from the kernel source. And there this function is in use.
This function is really a helper function. I think the best approach is to move this out of v4l2-tpg-core.c and into v4l2-tpg.h as a static inline.
That way it doesn't add to the kernel code size, but is still available when needed.
Perhaps add a comment in front of this function noting that it is used in v4l-utils.
Regards,
Hans
Quoted 48 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 17 ----------------- include/media/tpg/v4l2-tpg.h | 2 -- 2 files changed, 19 deletions(-)drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +0
-17@@ -2710,23 +2710,6 @@ void tpg_fill_plane_buffer(struct tpg_data *tpg, v4l2_std_id std, }EXPORT_SYMBOL_GPL (tpg_fill_plane_buffer); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf) -{ -unsigned offset =0 ; -unsigned i; - -if (tpg->buffers >1 ) { -tpg_fill_plane_buffer (tpg, std, p, vbuf); -return ; - } - -for (i =0 ; i <tpg_g_planes (tpg); i++) { -tpg_fill_plane_buffer (tpg, std, i, vbuf + offset); - offset +=tpg_calc_plane_size (tpg, i); - } -} -EXPORT_SYMBOL_GPL (tpg_fillbuffer); -MODULE_DESCRIPTION ("V4L2 Test Pattern Generator" );MODULE_AUTHOR ("Hans Verkuil" );MODULE_LICENSE ("GPL" );include/media/tpg/v4l2-tpg.h +0
-2@@ -248,8 +248,6 @@ void tpg_calc_text_basep(struct tpg_data *tpg,unsigned tpg_g_interleaved_plane (const struct tpg_data *tpg,unsigned buf_line);void tpg_fill_plane_buffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std, -unsigned p,u8 *vbuf);bool tpg_s_fourcc (struct tpg_data *tpg,u32 fourcc);void tpg_s_crop_compose (struct tpg_data *tpg,const struct v4l2_rect *crop,const struct v4l2_rect *compose);
Quoted 7 lines · * Hans Verkuil ([email protected]) wrote:
Quoted 6 lines · On 04/06/2025 00:51, [email protected] wrote:
From: "Dr. David Alan Gilbert" <[email protected]>
The last use of
tpg_fillbuffer()was removed in 2015 by commitddcaee9dd4c0("[media] vivid: add support for single buffer planar formats")
Quoted 6 lines
Quoted 1 line
Remove it.
Ah, this can't be removed.
This tpg code is actually also used in
git://linuxtv.org/v4l-utils.gitwhich copies the code from the kernel source. And there this function is in use.
Ah OK, fair enough.
Quoted 4 lines
This function is really a helper function. I think the best approach is to move this out of
v4l2-tpg-core.cand intov4l2-tpg.has a static inline.That way it doesn't add to the kernel code size, but is still available when needed.
It feels a bit bug for a static inline to me; personally I wouldn't worry that much about kernel size in that case - the tpg is in a separate module isn't it, which I guess is rarely used in normal use?
Quoted 1 line
Perhaps add a comment in front of this function noting that it is used in v4l-utils.
Yeh, reasonable,
Thanks for the review,
Dave
Quoted 54 lines
Regards,
Hans
Quoted 48 lines
Signed-off-by Dr. David Alan Gilbert <[email protected]>--- drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 17 ----------------- include/media/tpg/v4l2-tpg.h | 2 -- 2 files changed, 19 deletions(-)drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +0
-17@@ -2710,23 +2710,6 @@ void tpg_fill_plane_buffer(struct tpg_data *tpg, v4l2_std_id std, }EXPORT_SYMBOL_GPL (tpg_fill_plane_buffer); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf) -{ -unsigned offset =0 ; -unsigned i; - -if (tpg->buffers >1 ) { -tpg_fill_plane_buffer (tpg, std, p, vbuf); -return ; - } - -for (i =0 ; i <tpg_g_planes (tpg); i++) { -tpg_fill_plane_buffer (tpg, std, i, vbuf + offset); - offset +=tpg_calc_plane_size (tpg, i); - } -} -EXPORT_SYMBOL_GPL (tpg_fillbuffer); -MODULE_DESCRIPTION ("V4L2 Test Pattern Generator" );MODULE_AUTHOR ("Hans Verkuil" );MODULE_LICENSE ("GPL" );include/media/tpg/v4l2-tpg.h +0
-2@@ -248,8 +248,6 @@ void tpg_calc_text_basep(struct tpg_data *tpg,unsigned tpg_g_interleaved_plane (const struct tpg_data *tpg,unsigned buf_line);void tpg_fill_plane_buffer (struct tpg_data *tpg,v4l2_std_id std,unsigned p,u8 *vbuf); -void tpg_fillbuffer (struct tpg_data *tpg,v4l2_std_id std, -unsigned p,u8 *vbuf);bool tpg_s_fourcc (struct tpg_data *tpg,u32 fourcc);void tpg_s_crop_compose (struct tpg_data *tpg,const struct v4l2_rect *crop,const struct v4l2_rect *compose);
Signature · 4 lines
-----Open up your eyes, open up your mind, open up your code ------- / Dr. David Alan Gilbert | Running GNU/Linux | Happy \ \ dave @ treblig.org | | In Hex / \ _________________________|_____ http://www.treblig.org |_______/