Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: media: drop vb2_ops_wait_prepare/finish

Browse Source 
Since commit 88785982a1 ("media: vb2: use lock if wait_prepare/finish
are NULL") it is no longer needed to set the wait_prepare/finish
vb2_ops callbacks as long as the lock field in vb2_queue is set.

Since the vb2_ops_wait_prepare/finish callbacks already rely on that field,
we can safely drop these callbacks.

This simplifies the code and this is a step towards the goal of deleting
these callbacks.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> # for meson/vdec
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # drivers/staging/media/tegra-video/vi.c
This commit is contained in:
Hans Verkuil 2024-10-14 17:06:36 +02:00
parent 7a9c25d52e
commit 3576f817c5
12 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/media/atomisp/pci/atomisp_fops.c
View File

@ -441,8 +441,6 @@ const struct vb2_ops atomisp_vb2_ops = {
.buf_queue = atomisp_buf_queue, .buf_queue = atomisp_buf_queue,
.start_streaming = atomisp_start_streaming, .start_streaming = atomisp_start_streaming,
.stop_streaming = atomisp_stop_streaming, .stop_streaming = atomisp_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
static void atomisp_dev_init_struct(struct atomisp_device *isp) static void atomisp_dev_init_struct(struct atomisp_device *isp)

2
drivers/staging/media/deprecated/atmel/atmel-isc-base.c
View File

@ -477,8 +477,6 @@ static struct isc_format *find_format_by_fourcc(struct isc_device *isc,
static const struct vb2_ops isc_vb2_ops = { static const struct vb2_ops isc_vb2_ops = {
.queue_setup = isc_queue_setup, .queue_setup = isc_queue_setup,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
.buf_prepare = isc_buffer_prepare, .buf_prepare = isc_buffer_prepare,
.start_streaming = isc_start_streaming, .start_streaming = isc_start_streaming,
.stop_streaming = isc_stop_streaming, .stop_streaming = isc_stop_streaming,

2
drivers/staging/media/imx/imx-media-capture.c
View File

@ -768,8 +768,6 @@ static const struct vb2_ops capture_qops = {
.buf_init = capture_buf_init, .buf_init = capture_buf_init,
.buf_prepare = capture_buf_prepare, .buf_prepare = capture_buf_prepare,
.buf_queue = capture_buf_queue, .buf_queue = capture_buf_queue,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
.start_streaming = capture_start_streaming, .start_streaming = capture_start_streaming,
.stop_streaming = capture_stop_streaming, .stop_streaming = capture_stop_streaming,
}; };

2
drivers/staging/media/imx/imx-media-csc-scaler.c
View File

@ -572,8 +572,6 @@ static const struct vb2_ops ipu_csc_scaler_qops = {
.queue_setup = ipu_csc_scaler_queue_setup, .queue_setup = ipu_csc_scaler_queue_setup,
.buf_prepare = ipu_csc_scaler_buf_prepare, .buf_prepare = ipu_csc_scaler_buf_prepare,
.buf_queue = ipu_csc_scaler_buf_queue, .buf_queue = ipu_csc_scaler_buf_queue,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
.start_streaming = ipu_csc_scaler_start_streaming, .start_streaming = ipu_csc_scaler_start_streaming,
.stop_streaming = ipu_csc_scaler_stop_streaming, .stop_streaming = ipu_csc_scaler_stop_streaming,
}; };

2
drivers/staging/media/ipu3/ipu3-v4l2.c
View File

@ -937,8 +937,6 @@ static const struct vb2_ops imgu_vb2_ops = {
.queue_setup = imgu_vb2_queue_setup, .queue_setup = imgu_vb2_queue_setup,
.start_streaming = imgu_vb2_start_streaming, .start_streaming = imgu_vb2_start_streaming,
.stop_streaming = imgu_vb2_stop_streaming, .stop_streaming = imgu_vb2_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
/****************** v4l2_file_operations *****************/ /****************** v4l2_file_operations *****************/

2
drivers/staging/media/meson/vdec/vdec.c
View File

@ -450,8 +450,6 @@ static const struct vb2_ops vdec_vb2_ops = {
.stop_streaming = vdec_stop_streaming, .stop_streaming = vdec_stop_streaming,
.buf_queue = vdec_vb2_buf_queue, .buf_queue = vdec_vb2_buf_queue,
.buf_prepare = vdec_vb2_buf_prepare, .buf_prepare = vdec_vb2_buf_prepare,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
static int static int

2
drivers/staging/media/rkvdec/rkvdec.c
View File

@ -617,8 +617,6 @@ static const struct vb2_ops rkvdec_queue_ops = {
.buf_request_complete = rkvdec_buf_request_complete, .buf_request_complete = rkvdec_buf_request_complete,
.start_streaming = rkvdec_start_streaming, .start_streaming = rkvdec_start_streaming,
.stop_streaming = rkvdec_stop_streaming, .stop_streaming = rkvdec_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
static int rkvdec_request_validate(struct media_request *req) static int rkvdec_request_validate(struct media_request *req)

2
drivers/staging/media/starfive/camss/stf-video.c
View File

@ -321,8 +321,6 @@ static void video_stop_streaming(struct vb2_queue *q)
static const struct vb2_ops stf_video_vb2_q_ops = { static const struct vb2_ops stf_video_vb2_q_ops = {
.queue_setup = video_queue_setup, .queue_setup = video_queue_setup,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
.buf_init = video_buf_init, .buf_init = video_buf_init,
.buf_prepare = video_buf_prepare, .buf_prepare = video_buf_prepare,
.buf_queue = video_buf_queue, .buf_queue = video_buf_queue,

2
drivers/staging/media/sunxi/cedrus/cedrus_video.c
View File

@ -570,8 +570,6 @@ static const struct vb2_ops cedrus_qops = {
.buf_request_complete = cedrus_buf_request_complete, .buf_request_complete = cedrus_buf_request_complete,
.start_streaming = cedrus_start_streaming, .start_streaming = cedrus_start_streaming,
.stop_streaming = cedrus_stop_streaming, .stop_streaming = cedrus_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
int cedrus_queue_init(void *priv, struct vb2_queue *src_vq, int cedrus_queue_init(void *priv, struct vb2_queue *src_vq,

2
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c
View File

@ -368,8 +368,6 @@ static const struct vb2_ops sun6i_isp_capture_queue_ops = {
.buf_queue = sun6i_isp_capture_buffer_queue, .buf_queue = sun6i_isp_capture_buffer_queue,
.start_streaming = sun6i_isp_capture_start_streaming, .start_streaming = sun6i_isp_capture_start_streaming,
.stop_streaming = sun6i_isp_capture_stop_streaming, .stop_streaming = sun6i_isp_capture_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
/* Video Device */ /* Video Device */

2
drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c
View File

@ -379,8 +379,6 @@ static const struct vb2_ops sun6i_isp_params_queue_ops = {
.buf_queue = sun6i_isp_params_buffer_queue, .buf_queue = sun6i_isp_params_buffer_queue,
.start_streaming = sun6i_isp_params_start_streaming, .start_streaming = sun6i_isp_params_start_streaming,
.stop_streaming = sun6i_isp_params_stop_streaming, .stop_streaming = sun6i_isp_params_stop_streaming,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
}; };
/* Video Device */ /* Video Device */

2
drivers/staging/media/tegra-video/vi.c
View File

@ -287,8 +287,6 @@ static const struct vb2_ops tegra_channel_queue_qops = {
.queue_setup = tegra_channel_queue_setup, .queue_setup = tegra_channel_queue_setup,
.buf_prepare = tegra_channel_buffer_prepare, .buf_prepare = tegra_channel_buffer_prepare,
.buf_queue = tegra_channel_buffer_queue, .buf_queue = tegra_channel_buffer_queue,
.wait_prepare = vb2_ops_wait_prepare,
.wait_finish = vb2_ops_wait_finish,
.start_streaming = tegra_channel_start_streaming, .start_streaming = tegra_channel_start_streaming,
.stop_streaming = tegra_channel_stop_streaming, .stop_streaming = tegra_channel_stop_streaming,
}; };