tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

media: pci: drop vb2_ops_wait_prepare/finish

Since commit 88785982a19d ("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>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>

Hans Verkuil bde5d79d d01e5a4d

-58
-2
drivers/media/pci/bt8xx/bttv-driver.c
··· 1584 1584 .buf_cleanup = buf_cleanup, 1585 1585 .start_streaming = start_streaming, 1586 1586 .stop_streaming = stop_streaming, 1587 - .wait_prepare = vb2_ops_wait_prepare, 1588 - .wait_finish = vb2_ops_wait_finish, 1589 1587 }; 1590 1588 1591 1589 static void radio_enable(struct bttv *btv)
-2
drivers/media/pci/bt8xx/bttv-vbi.c
··· 170 170 .buf_cleanup = buf_cleanup_vbi, 171 171 .start_streaming = start_streaming_vbi, 172 172 .stop_streaming = stop_streaming_vbi, 173 - .wait_prepare = vb2_ops_wait_prepare, 174 - .wait_finish = vb2_ops_wait_finish, 175 173 }; 176 174 177 175 /* ----------------------------------------------------------------------- */
-2
drivers/media/pci/cobalt/cobalt-v4l2.c
··· 424 424 .buf_queue = cobalt_buf_queue, 425 425 .start_streaming = cobalt_start_streaming, 426 426 .stop_streaming = cobalt_stop_streaming, 427 - .wait_prepare = vb2_ops_wait_prepare, 428 - .wait_finish = vb2_ops_wait_finish, 429 427 }; 430 428 431 429 /* V4L2 ioctls */
-2
drivers/media/pci/cx18/cx18-streams.c
··· 229 229 .buf_prepare = cx18_buf_prepare, 230 230 .start_streaming = cx18_start_streaming, 231 231 .stop_streaming = cx18_stop_streaming, 232 - .wait_prepare = vb2_ops_wait_prepare, 233 - .wait_finish = vb2_ops_wait_finish, 234 232 }; 235 233 236 234 static int cx18_stream_init(struct cx18 *cx, int type)
-2
drivers/media/pci/cx23885/cx23885-417.c
··· 1210 1210 .buf_prepare = buffer_prepare, 1211 1211 .buf_finish = buffer_finish, 1212 1212 .buf_queue = buffer_queue, 1213 - .wait_prepare = vb2_ops_wait_prepare, 1214 - .wait_finish = vb2_ops_wait_finish, 1215 1213 .start_streaming = cx23885_start_streaming, 1216 1214 .stop_streaming = cx23885_stop_streaming, 1217 1215 };
-2
drivers/media/pci/cx23885/cx23885-dvb.c
··· 170 170 .buf_prepare = buffer_prepare, 171 171 .buf_finish = buffer_finish, 172 172 .buf_queue = buffer_queue, 173 - .wait_prepare = vb2_ops_wait_prepare, 174 - .wait_finish = vb2_ops_wait_finish, 175 173 .start_streaming = cx23885_start_streaming, 176 174 .stop_streaming = cx23885_stop_streaming, 177 175 };
-2
drivers/media/pci/cx23885/cx23885-vbi.c
··· 249 249 .buf_prepare = buffer_prepare, 250 250 .buf_finish = buffer_finish, 251 251 .buf_queue = buffer_queue, 252 - .wait_prepare = vb2_ops_wait_prepare, 253 - .wait_finish = vb2_ops_wait_finish, 254 252 .start_streaming = cx23885_start_streaming, 255 253 .stop_streaming = cx23885_stop_streaming, 256 254 };
-2
drivers/media/pci/cx23885/cx23885-video.c
··· 519 519 .buf_prepare = buffer_prepare, 520 520 .buf_finish = buffer_finish, 521 521 .buf_queue = buffer_queue, 522 - .wait_prepare = vb2_ops_wait_prepare, 523 - .wait_finish = vb2_ops_wait_finish, 524 522 .start_streaming = cx23885_start_streaming, 525 523 .stop_streaming = cx23885_stop_streaming, 526 524 };
-2
drivers/media/pci/cx25821/cx25821-video.c
··· 295 295 .buf_prepare = cx25821_buffer_prepare, 296 296 .buf_finish = cx25821_buffer_finish, 297 297 .buf_queue = cx25821_buffer_queue, 298 - .wait_prepare = vb2_ops_wait_prepare, 299 - .wait_finish = vb2_ops_wait_finish, 300 298 .start_streaming = cx25821_start_streaming, 301 299 .stop_streaming = cx25821_stop_streaming, 302 300 };
-2
drivers/media/pci/cx88/cx88-blackbird.c
··· 781 781 .buf_prepare = buffer_prepare, 782 782 .buf_finish = buffer_finish, 783 783 .buf_queue = buffer_queue, 784 - .wait_prepare = vb2_ops_wait_prepare, 785 - .wait_finish = vb2_ops_wait_finish, 786 784 .start_streaming = start_streaming, 787 785 .stop_streaming = stop_streaming, 788 786 };
-2
drivers/media/pci/cx88/cx88-dvb.c
··· 152 152 .buf_prepare = buffer_prepare, 153 153 .buf_finish = buffer_finish, 154 154 .buf_queue = buffer_queue, 155 - .wait_prepare = vb2_ops_wait_prepare, 156 - .wait_finish = vb2_ops_wait_finish, 157 155 .start_streaming = start_streaming, 158 156 .stop_streaming = stop_streaming, 159 157 };
-2
drivers/media/pci/cx88/cx88-vbi.c
··· 228 228 .buf_prepare = buffer_prepare, 229 229 .buf_finish = buffer_finish, 230 230 .buf_queue = buffer_queue, 231 - .wait_prepare = vb2_ops_wait_prepare, 232 - .wait_finish = vb2_ops_wait_finish, 233 231 .start_streaming = start_streaming, 234 232 .stop_streaming = stop_streaming, 235 233 };
-2
drivers/media/pci/cx88/cx88-video.c
··· 562 562 .buf_prepare = buffer_prepare, 563 563 .buf_finish = buffer_finish, 564 564 .buf_queue = buffer_queue, 565 - .wait_prepare = vb2_ops_wait_prepare, 566 - .wait_finish = vb2_ops_wait_finish, 567 565 .start_streaming = start_streaming, 568 566 .stop_streaming = stop_streaming, 569 567 };
-2
drivers/media/pci/dt3155/dt3155.c
··· 222 222 223 223 static const struct vb2_ops q_ops = { 224 224 .queue_setup = dt3155_queue_setup, 225 - .wait_prepare = vb2_ops_wait_prepare, 226 - .wait_finish = vb2_ops_wait_finish, 227 225 .buf_prepare = dt3155_buf_prepare, 228 226 .start_streaming = dt3155_start_streaming, 229 227 .stop_streaming = dt3155_stop_streaming,
-2
drivers/media/pci/intel/ipu3/ipu3-cio2.c
··· 1045 1045 .queue_setup = cio2_vb2_queue_setup, 1046 1046 .start_streaming = cio2_vb2_start_streaming, 1047 1047 .stop_streaming = cio2_vb2_stop_streaming, 1048 - .wait_prepare = vb2_ops_wait_prepare, 1049 - .wait_finish = vb2_ops_wait_finish, 1050 1048 }; 1051 1049 1052 1050 /**************** V4L2 interface ****************/
-2
drivers/media/pci/intel/ipu6/ipu6-isys-queue.c
··· 767 767 768 768 static const struct vb2_ops ipu6_isys_queue_ops = { 769 769 .queue_setup = queue_setup, 770 - .wait_prepare = vb2_ops_wait_prepare, 771 - .wait_finish = vb2_ops_wait_finish, 772 770 .buf_prepare = ipu6_isys_buf_prepare, 773 771 .start_streaming = start_streaming, 774 772 .stop_streaming = stop_streaming,
-2
drivers/media/pci/mgb4/mgb4_vin.c
··· 304 304 .buf_queue = buffer_queue, 305 305 .start_streaming = start_streaming, 306 306 .stop_streaming = stop_streaming, 307 - .wait_prepare = vb2_ops_wait_prepare, 308 - .wait_finish = vb2_ops_wait_finish 309 307 }; 310 308 311 309 static int fh_open(struct file *file)
-2
drivers/media/pci/mgb4/mgb4_vout.c
··· 230 230 .buf_queue = buffer_queue, 231 231 .start_streaming = start_streaming, 232 232 .stop_streaming = stop_streaming, 233 - .wait_prepare = vb2_ops_wait_prepare, 234 - .wait_finish = vb2_ops_wait_finish 235 233 }; 236 234 237 235 static int vidioc_querycap(struct file *file, void *priv,
-2
drivers/media/pci/saa7134/saa7134-empress.c
··· 78 78 .buf_init = saa7134_ts_buffer_init, 79 79 .buf_prepare = saa7134_ts_buffer_prepare, 80 80 .buf_queue = saa7134_vb2_buffer_queue, 81 - .wait_prepare = vb2_ops_wait_prepare, 82 - .wait_finish = vb2_ops_wait_finish, 83 81 .start_streaming = start_streaming, 84 82 .stop_streaming = stop_streaming, 85 83 };
-2
drivers/media/pci/saa7134/saa7134-ts.c
··· 166 166 .buf_init = saa7134_ts_buffer_init, 167 167 .buf_prepare = saa7134_ts_buffer_prepare, 168 168 .buf_queue = saa7134_vb2_buffer_queue, 169 - .wait_prepare = vb2_ops_wait_prepare, 170 - .wait_finish = vb2_ops_wait_finish, 171 169 .stop_streaming = saa7134_ts_stop_streaming, 172 170 }; 173 171 EXPORT_SYMBOL_GPL(saa7134_ts_qops);
-2
drivers/media/pci/saa7134/saa7134-vbi.c
··· 161 161 .buf_init = buffer_init, 162 162 .buf_prepare = buffer_prepare, 163 163 .buf_queue = saa7134_vb2_buffer_queue, 164 - .wait_prepare = vb2_ops_wait_prepare, 165 - .wait_finish = vb2_ops_wait_finish, 166 164 .start_streaming = saa7134_vb2_start_streaming, 167 165 .stop_streaming = saa7134_vb2_stop_streaming, 168 166 };
-2
drivers/media/pci/saa7134/saa7134-video.c
··· 844 844 .buf_init = buffer_init, 845 845 .buf_prepare = buffer_prepare, 846 846 .buf_queue = saa7134_vb2_buffer_queue, 847 - .wait_prepare = vb2_ops_wait_prepare, 848 - .wait_finish = vb2_ops_wait_finish, 849 847 .start_streaming = saa7134_vb2_start_streaming, 850 848 .stop_streaming = saa7134_vb2_stop_streaming, 851 849 };
-2
drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
··· 756 756 .buf_finish = solo_enc_buf_finish, 757 757 .start_streaming = solo_enc_start_streaming, 758 758 .stop_streaming = solo_enc_stop_streaming, 759 - .wait_prepare = vb2_ops_wait_prepare, 760 - .wait_finish = vb2_ops_wait_finish, 761 759 }; 762 760 763 761 static int solo_enc_querycap(struct file *file, void *priv,
-2
drivers/media/pci/solo6x10/solo6x10-v4l2.c
··· 365 365 .buf_queue = solo_buf_queue, 366 366 .start_streaming = solo_start_streaming, 367 367 .stop_streaming = solo_stop_streaming, 368 - .wait_prepare = vb2_ops_wait_prepare, 369 - .wait_finish = vb2_ops_wait_finish, 370 368 }; 371 369 372 370 static int solo_querycap(struct file *file, void *priv,
-2
drivers/media/pci/sta2x11/sta2x11_vip.c
··· 372 372 .buf_queue = buffer_queue, 373 373 .start_streaming = start_streaming, 374 374 .stop_streaming = stop_streaming, 375 - .wait_prepare = vb2_ops_wait_prepare, 376 - .wait_finish = vb2_ops_wait_finish, 377 375 }; 378 376 379 377
-2
drivers/media/pci/tw5864/tw5864-video.c
··· 471 471 .buf_queue = tw5864_buf_queue, 472 472 .start_streaming = tw5864_start_streaming, 473 473 .stop_streaming = tw5864_stop_streaming, 474 - .wait_prepare = vb2_ops_wait_prepare, 475 - .wait_finish = vb2_ops_wait_finish, 476 474 }; 477 475 478 476 static int tw5864_s_ctrl(struct v4l2_ctrl *ctrl)
-2
drivers/media/pci/tw68/tw68-video.c
··· 524 524 .buf_finish = tw68_buf_finish, 525 525 .start_streaming = tw68_start_streaming, 526 526 .stop_streaming = tw68_stop_streaming, 527 - .wait_prepare = vb2_ops_wait_prepare, 528 - .wait_finish = vb2_ops_wait_finish, 529 527 }; 530 528 531 529 /* ------------------------------------------------------------------ */
-2
drivers/media/pci/tw686x/tw686x-video.c
··· 579 579 .buf_prepare = tw686x_buf_prepare, 580 580 .start_streaming = tw686x_start_streaming, 581 581 .stop_streaming = tw686x_stop_streaming, 582 - .wait_prepare = vb2_ops_wait_prepare, 583 - .wait_finish = vb2_ops_wait_finish, 584 582 }; 585 583 586 584 static int tw686x_s_ctrl(struct v4l2_ctrl *ctrl)
-2
drivers/media/pci/zoran/zoran_driver.c
··· 950 950 .buf_prepare = zr_vb2_prepare, 951 951 .start_streaming = zr_vb2_start_streaming, 952 952 .stop_streaming = zr_vb2_stop_streaming, 953 - .wait_prepare = vb2_ops_wait_prepare, 954 - .wait_finish = vb2_ops_wait_finish, 955 953 }; 956 954 957 955 int zoran_queue_init(struct zoran *zr, struct vb2_queue *vq, int dir)