Commit bde5d79d authored by Hans Verkuil's avatar Hans Verkuil
Browse files

media: pci: 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>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
parent d01e5a4d

drivers/media/pci/bt8xx/bttv-driver.c

+0 −2
Original line number Diff line number Diff line
@@ -1584,8 +1584,6 @@ static const struct vb2_ops bttv_video_qops = { 
	.buf_cleanup    = buf_cleanup,

	.start_streaming = start_streaming,

	.stop_streaming = stop_streaming,

	.wait_prepare   = vb2_ops_wait_prepare,

	.wait_finish    = vb2_ops_wait_finish,

};



static void radio_enable(struct bttv *btv)

drivers/media/pci/bt8xx/bttv-vbi.c

+0 −2
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ const struct vb2_ops bttv_vbi_qops = { 
	.buf_cleanup	= buf_cleanup_vbi,

	.start_streaming = start_streaming_vbi,

	.stop_streaming = stop_streaming_vbi,

	.wait_prepare   = vb2_ops_wait_prepare,

	.wait_finish    = vb2_ops_wait_finish,

};



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

drivers/media/pci/cobalt/cobalt-v4l2.c

+0 −2
Original line number Diff line number Diff line
@@ -424,8 +424,6 @@ static const struct vb2_ops cobalt_qops = { 
	.buf_queue = cobalt_buf_queue,

	.start_streaming = cobalt_start_streaming,

	.stop_streaming = cobalt_stop_streaming,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

};



/* V4L2 ioctls */

drivers/media/pci/cx18/cx18-streams.c

+0 −2
Original line number Diff line number Diff line
@@ -229,8 +229,6 @@ static const struct vb2_ops cx18_vb2_qops = { 
	.buf_prepare		= cx18_buf_prepare,

	.start_streaming	= cx18_start_streaming,

	.stop_streaming		= cx18_stop_streaming,

	.wait_prepare		= vb2_ops_wait_prepare,

	.wait_finish		= vb2_ops_wait_finish,

};



static int cx18_stream_init(struct cx18 *cx, int type)

drivers/media/pci/cx23885/cx23885-417.c

+0 −2
Original line number Diff line number Diff line
@@ -1210,8 +1210,6 @@ static const struct vb2_ops cx23885_qops = { 
	.buf_prepare  = buffer_prepare,

	.buf_finish = buffer_finish,

	.buf_queue    = buffer_queue,

	.wait_prepare = vb2_ops_wait_prepare,

	.wait_finish = vb2_ops_wait_finish,

	.start_streaming = cx23885_start_streaming,

	.stop_streaming = cx23885_stop_streaming,

};