Commit 30e932f5 authored by Hans Verkuil's avatar Hans Verkuil
Browse files

media: usb: drop vb2_ops_wait_prepare/finish 



Since commit 88785982 ("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: default avatarHans Verkuil <hverkuil@xs4all.nl>
parent bde5d79d

drivers/media/usb/airspy/airspy.c

+0 −2
Original line number Diff line number Diff line
@@ -603,8 +603,6 @@ static const struct vb2_ops airspy_vb2_ops = { 
	.buf_queue              = airspy_buf_queue,

	.start_streaming        = airspy_start_streaming,

	.stop_streaming         = airspy_stop_streaming,

	.wait_prepare           = vb2_ops_wait_prepare,

	.wait_finish            = vb2_ops_wait_finish,

};



static int airspy_querycap(struct file *file, void *fh,

drivers/media/usb/au0828/au0828-vbi.c

+0 −2
Original line number Diff line number Diff line
@@ -74,6 +74,4 @@ const struct vb2_ops au0828_vbi_qops = { 
	.prepare_streaming = v4l_vb2q_enable_media_source,

	.start_streaming = au0828_start_analog_streaming,

	.stop_streaming  = au0828_stop_vbi_streaming,

	.wait_prepare    = vb2_ops_wait_prepare,

	.wait_finish     = vb2_ops_wait_finish,

};

drivers/media/usb/au0828/au0828-video.c

+0 −2
Original line number Diff line number Diff line
@@ -915,8 +915,6 @@ static const struct vb2_ops au0828_video_qops = { 
	.prepare_streaming = v4l_vb2q_enable_media_source,

	.start_streaming = au0828_start_analog_streaming,

	.stop_streaming  = au0828_stop_streaming,

	.wait_prepare    = vb2_ops_wait_prepare,

	.wait_finish     = vb2_ops_wait_finish,

};



/* ------------------------------------------------------------------

drivers/media/usb/cx231xx/cx231xx-417.c

+0 −2
Original line number Diff line number Diff line
@@ -1458,8 +1458,6 @@ static const struct vb2_ops cx231xx_video_qops = { 
	.buf_queue		= buffer_queue,

	.start_streaming	= start_streaming,

	.stop_streaming		= stop_streaming,

	.wait_prepare		= vb2_ops_wait_prepare,

	.wait_finish		= vb2_ops_wait_finish,

};



/* ------------------------------------------------------------------ */

drivers/media/usb/cx231xx/cx231xx-vbi.c

+0 −2
Original line number Diff line number Diff line
@@ -243,8 +243,6 @@ struct vb2_ops cx231xx_vbi_qops = { 
	.buf_queue = vbi_buf_queue,

	.start_streaming = vbi_start_streaming,

	.stop_streaming = vbi_stop_streaming,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

};



/* ------------------------------------------------------------------