media: start work to remove wait_prepare/finish callbacks

For read/write support the vb2_thread is used. This will queue and dequeue buffers automatically to provide the read() or write() feature.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

It was also used around vb2_core_qbuf(), but VIDIOC_QBUF doesn't need this since it doesn't do a blocking wait, so just drop the wait_finish/prepare callbacks around vb2_core_qbuf().

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +0 -0

index d064e0664851b26b2da71e0a374c49a2d2c5e217..e9c1d9e3222323be50b3039eb463384a3d558239 100644

drivers/media/common/videobuf2/videobuf2-core.c +4 -3

 			if (!threadio->stop)
 				ret = vb2_core_dqbuf(q, &index, NULL, 0);
-			call_void_qop(q, wait_prepare, q);
+			if (q->ops->wait_prepare)
+				call_void_qop(q, wait_prepare, q);
+			else if (q->lock)
+				mutex_unlock(q->lock);
 			dprintk(q, 5, "file io: vb2_dqbuf result: %d\n", ret);
 			if (!ret)
 				vb = vb2_get_buffer(q, index);

@@ -3233,12 +3239,10 @@ static int vb2_thread(void *data)
 		if (vb->state != VB2_BUF_STATE_ERROR)
 			if (threadio->fnc(vb, threadio->priv))
 				break;
-		call_void_qop(q, wait_finish, q);
 		if (copy_timestamp)
 			vb->timestamp = ktime_get_ns();
 		if (!threadio->stop)
 			ret = vb2_core_qbuf(q, vb, NULL, NULL);
-		call_void_qop(q, wait_prepare, q);
 		if (ret || threadio->stop)
 			break;
 	}

Hi Hans,

Thank you for the patch.

Quoted 31 lines · Hans Verkuil

For read/write support the vb2_thread is used. This will queue and dequeue buffers automatically to provide the read() or write() feature.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

It was also used around vb2_core_qbuf(), but VIDIOC_QBUF doesn't need this since it doesn't do a blocking wait, so just drop the wait_finish/prepare callbacks around vb2_core_qbuf().

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +2 -1

index d064e0664851b26b2da71e0a374c49a2d2c5e217..e9c1d9e3222323be50b3039eb463384a3d558239 100644
@@ -3218,10 +3218,16 @@ static int vb2_thread(void *data)
 				continue;
 			prequeue--;
 		} else {
-			call_void_qop(q, wait_finish, q);
+			if (q->ops->wait_finish)
+				call_void_qop(q, wait_finish, q);

drivers/media/common/videobuf2/videobuf2-core.c static int vb2_thread(void *data) · line 3224

Quoted 2 lines

drivers/media/common/videobuf2/videobuf2-core.c +2 -0

+			else if (q->lock)
+				mutex_lock(q->lock);

I would still prefer moving vb2_ops_wait_prepare() and vb2_ops_wait_finish() to videobuf2-core.c and calling the functions here, instead of locking the mutex directly. I think it would make the code more readable. I won't block the patch for this, but I think it would be better.

Also, should we check at queue init time that drivers either set a queue lock or provide the .wait_prepare() and .wait_finish() operations ?

Quoted 25 lines

drivers/media/common/videobuf2/videobuf2-core.c +4 -3

 			if (!threadio->stop)
 				ret = vb2_core_dqbuf(q, &index, NULL, 0);
-			call_void_qop(q, wait_prepare, q);
+			if (q->ops->wait_prepare)
+				call_void_qop(q, wait_prepare, q);
+			else if (q->lock)
+				mutex_unlock(q->lock);
 			dprintk(q, 5, "file io: vb2_dqbuf result: %d\n", ret);
 			if (!ret)
 				vb = vb2_get_buffer(q, index);

@@ -3233,12 +3239,10 @@ static int vb2_thread(void *data)
 		if (vb->state != VB2_BUF_STATE_ERROR)
 			if (threadio->fnc(vb, threadio->priv))
 				break;
-		call_void_qop(q, wait_finish, q);
 		if (copy_timestamp)
 			vb->timestamp = ktime_get_ns();
 		if (!threadio->stop)
 			ret = vb2_core_qbuf(q, vb, NULL, NULL);
-		call_void_qop(q, wait_prepare, q);
 		if (ret || threadio->stop)
 			break;
 	}

Quoted 32 lines · Laurent Pinchart

Quoted 31 lines · Hans Verkuil

For read/write support the vb2_thread is used. This will queue and dequeue buffers automatically to provide the read() or write() feature.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

It was also used around vb2_core_qbuf(), but VIDIOC_QBUF doesn't need this since it doesn't do a blocking wait, so just drop the wait_finish/prepare callbacks around vb2_core_qbuf().

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +2 -1

index d064e0664851b26b2da71e0a374c49a2d2c5e217..e9c1d9e3222323be50b3039eb463384a3d558239 100644
@@ -3218,10 +3218,16 @@ static int vb2_thread(void *data)
 				continue;
 			prequeue--;
 		} else {
-			call_void_qop(q, wait_finish, q);
+			if (q->ops->wait_finish)
+				call_void_qop(q, wait_finish, q);

Quoted 8 lines

drivers/media/common/videobuf2/videobuf2-core.c static int vb2_thread(void *data) · line 3224

Quoted 2 lines

drivers/media/common/videobuf2/videobuf2-core.c +2 -0

+			else if (q->lock)
+				mutex_lock(q->lock);

I would still prefer moving vb2_ops_wait_prepare() and vb2_ops_wait_finish() to videobuf2-core.c and calling the functions here, instead of locking the mutex directly. I think it would make the code more readable. I won't block the patch for this, but I think it would be better.

The whole point of this series is to prepare for the removal of the wait_finish/prepare callbacks. So this patch is just a temporary change.

Eventually this code will change to just a mutex_lock.

Quoted 2 lines

Also, should we check at queue init time that drivers either set a queue lock or provide the .wait_prepare() and .wait_finish() operations ?

It does that already, from videobuf2-core.c, vb2_core_queue_init():

        /* Warn if q->lock is NULL and no custom wait_prepare is provided */
        if (WARN_ON(!q->lock && !q->ops->wait_prepare))
                return -EINVAL;

Quoted 24 lines

Quoted 24 lines

drivers/media/common/videobuf2/videobuf2-core.c +4 -3

 			if (!threadio->stop)
 				ret = vb2_core_dqbuf(q, &index, NULL, 0);
-			call_void_qop(q, wait_prepare, q);
+			if (q->ops->wait_prepare)
+				call_void_qop(q, wait_prepare, q);
+			else if (q->lock)
+				mutex_unlock(q->lock);
 			dprintk(q, 5, "file io: vb2_dqbuf result: %d\n", ret);
 			if (!ret)
 				vb = vb2_get_buffer(q, index);

@@ -3233,12 +3239,10 @@ static int vb2_thread(void *data)
 		if (vb->state != VB2_BUF_STATE_ERROR)
 			if (threadio->fnc(vb, threadio->priv))
 				break;
-		call_void_qop(q, wait_finish, q);
 		if (copy_timestamp)
 			vb->timestamp = ktime_get_ns();
 		if (!threadio->stop)
 			ret = vb2_core_qbuf(q, vb, NULL, NULL);
-		call_void_qop(q, wait_prepare, q);
 		if (ret || threadio->stop)
 			break;
 	}

For read/write support the vb2_thread is used. This will queue and dequeue buffers automatically to provide the read() or write() feature.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

It was also used around vb2_core_qbuf(), but VIDIOC_QBUF doesn't need this since it doesn't do a blocking wait, so just drop the wait_finish/prepare callbacks around vb2_core_qbuf().

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +4 -1

index d064e0664851b26b2da71e0a374c49a2d2c5e217..e9c1d9e3222323be50b3039eb463384a3d558239 100644
@@ -3218,10 +3218,16 @@ static int vb2_thread(void *data)
 				continue;
 			prequeue--;
 		} else {
-			call_void_qop(q, wait_finish, q);
+			if (q->ops->wait_finish)
+				call_void_qop(q, wait_finish, q);
+			else if (q->lock)
+				mutex_lock(q->lock);

Em Mon, 14 Oct 2024 17:06:28 +0200
Hans Verkuil <[email protected]> escreveu:

Quoted 33 lines

For read/write support the vb2_thread is used. This will queue and dequeue buffers automatically to provide the read() or write() feature.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

It was also used around vb2_core_qbuf(), but VIDIOC_QBUF doesn't need this since it doesn't do a blocking wait, so just drop the wait_finish/prepare callbacks around vb2_core_qbuf().

Signed-off-by Hans Verkuil <[email protected]>

---
 drivers/media/common/videobuf2/videobuf2-core.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +4 -1

index d064e0664851b26b2da71e0a374c49a2d2c5e217..e9c1d9e3222323be50b3039eb463384a3d558239 100644
@@ -3218,10 +3218,16 @@ static int vb2_thread(void *data)
 				continue;
 			prequeue--;
 		} else {
-			call_void_qop(q, wait_finish, q);
+			if (q->ops->wait_finish)
+				call_void_qop(q, wait_finish, q);
+			else if (q->lock)
+				mutex_lock(q->lock);

drivers/media/common/videobuf2/videobuf2-core.c static int vb2_thread(void *data) · line 3233

Quoted 10 lines

drivers/media/common/videobuf2/videobuf2-core.c +4 -1

 			if (!threadio->stop)
 				ret = vb2_core_dqbuf(q, &index, NULL, 0);
-			call_void_qop(q, wait_prepare, q);
+			if (q->ops->wait_prepare)
+				call_void_qop(q, wait_prepare, q);
+			else if (q->lock)
+				mutex_unlock(q->lock);
 			dprintk(q, 5, "file io: vb2_dqbuf result: %d\n", ret);
 			if (!ret)
 				vb = vb2_get_buffer(q, index);

Looks OK to me.

drivers/media/common/videobuf2/videobuf2-core.c static int vb2_thread(void *data) · line 3246

Quoted 11 lines

drivers/media/common/videobuf2/videobuf2-core.c +0 -2

@@ -3233,12 +3239,10 @@ static int vb2_thread(void *data)
 		if (vb->state != VB2_BUF_STATE_ERROR)
 			if (threadio->fnc(vb, threadio->priv))
 				break;
-		call_void_qop(q, wait_finish, q);
 		if (copy_timestamp)
 			vb->timestamp = ktime_get_ns();
 		if (!threadio->stop)
 			ret = vb2_core_qbuf(q, vb, NULL, NULL);
-		call_void_qop(q, wait_prepare, q);
 		if (ret || threadio->stop)

This hunk looks suspicious on my eyes.

Why this is not needed?

Had you test with all vb2 callers including the DVB one?

If this is fixing a pre-existing condition, which seems the case, please place it on a separate patch, clearly stating why we need to drop an old code.

An alternative would be, for now, apply the same change as you did at the first hunk, e. g.:

	if (q->ops->wait_finish)
		call_void_qop(q, wait_finish, q);
	else if (q->lock)
		mutex_lock(q->lock);

	...
	if (q->ops->wait_prepare)
		call_void_qop(q, wait_prepare, q);
	else if (q->lock)
		mutex_unlock(q->lock);

And only drop those when we're certain that none of the devices would break with such change.

Once patch 1 is fixed, feel free to add my:

Reviewed-by Mauro Carvalho Chehab <[email protected]>

for patches 2-10.

Thanks,
Mauro

The vb2_thread is used for DVB support. This will queue and dequeue buffers automatically.

It calls wait_finish/prepare around vb2_core_dqbuf() and vb2_core_qbuf(), but that assumes all drivers have these ops set. But that will change due to commit 88785982a19d ("media: vb2: use lock if wait_prepare/finish are NULL").

So instead just check if the callback is available, and if not, use q->lock, just as __vb2_wait_for_done_vb() does.

Signed-off-by Hans Verkuil <[email protected]>

---
I'm just updating this patch, not the others in this series.

Changes since v1:
- move the locking code inside the 'if (!threadio->stop)'
- do the same for vb2_core_qbuf()

---
 .../media/common/videobuf2/videobuf2-core.c   | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

drivers/media/common/videobuf2/videobuf2-core.c +15 -5

index d064e0664851..d2275c878ea9 100644
@@ -3218,10 +3218,17 @@ static int vb2_thread(void *data)
 				continue;
 			prequeue--;
 		} else {
-			call_void_qop(q, wait_finish, q);
-			if (!threadio->stop)
+			if (!threadio->stop) {
+				if (q->ops->wait_finish)
+					call_void_qop(q, wait_finish, q);
+				else if (q->lock)
+					mutex_lock(q->lock);
 				ret = vb2_core_dqbuf(q, &index, NULL, 0);
-			call_void_qop(q, wait_prepare, q);
+				if (q->ops->wait_prepare)
+					call_void_qop(q, wait_prepare, q);
+				else if (q->lock)
+					mutex_unlock(q->lock);
+			}
 			dprintk(q, 5, "file io: vb2_dqbuf result: %d\n", ret);
 			if (!ret)
 				vb = vb2_get_buffer(q, index);

@@ -3233,12 +3240,19 @@ static int vb2_thread(void *data)
 		if (vb->state != VB2_BUF_STATE_ERROR)
 			if (threadio->fnc(vb, threadio->priv))
 				break;
-		call_void_qop(q, wait_finish, q);
 		if (copy_timestamp)
 			vb->timestamp = ktime_get_ns();
-		if (!threadio->stop)
+		if (!threadio->stop) {
+			if (q->ops->wait_finish)
+				call_void_qop(q, wait_finish, q);
+			else if (q->lock)
+				mutex_lock(q->lock);

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 <[email protected]>

---
  drivers/media/test-drivers/vicodec/vicodec-core.c  | 2 --
  drivers/media/test-drivers/vim2m.c                 | 2 --
  drivers/media/test-drivers/vimc/vimc-capture.c     | 6 ------
  drivers/media/test-drivers/visl/visl-video.c       | 2 --
  drivers/media/test-drivers/vivid/vivid-meta-cap.c  | 2 --
  drivers/media/test-drivers/vivid/vivid-meta-out.c  | 2 --
  drivers/media/test-drivers/vivid/vivid-sdr-cap.c   | 2 --
  drivers/media/test-drivers/vivid/vivid-touch-cap.c | 2 --
  drivers/media/test-drivers/vivid/vivid-vbi-cap.c   | 2 --
  drivers/media/test-drivers/vivid/vivid-vbi-out.c   | 2 --
  drivers/media/test-drivers/vivid/vivid-vid-cap.c   | 2 --
  drivers/media/test-drivers/vivid/vivid-vid-out.c   | 2 --
  12 files changed, 28 deletions(-)

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 <[email protected]>

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 <[email protected]>

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 <[email protected]>

---
  drivers/media/platform/allegro-dvt/allegro-core.c                   | 2 --
  drivers/media/platform/amlogic/meson-ge2d/ge2d.c                    | 2 --
  drivers/media/platform/amphion/vpu_v4l2.c                           | 2 --
  drivers/media/platform/aspeed/aspeed-video.c                        | 2 --
  drivers/media/platform/atmel/atmel-isi.c                            | 2 --
  drivers/media/platform/broadcom/bcm2835-unicam.c                    | 2 --
  drivers/media/platform/chips-media/coda/coda-common.c               | 2 --
  drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c            | 2 --
  drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c            | 2 --
  drivers/media/platform/imagination/e5010-jpeg-enc.c                 | 2 --
  drivers/media/platform/intel/pxa_camera.c                           | 2 --
  drivers/media/platform/m2m-deinterlace.c                            | 2 --
  drivers/media/platform/marvell/mcam-core.c                          | 4 ----
  drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c                | 4 ----
  drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c                   | 2 --
  drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c                 | 2 --
  .../platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateful.c      | 2 --
  .../platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c     | 2 --
  drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c     | 2 --
  drivers/media/platform/microchip/microchip-isc-base.c               | 2 --
  drivers/media/platform/nuvoton/npcm-video.c                         | 2 --
  drivers/media/platform/nvidia/tegra-vde/v4l2.c                      | 2 --
  drivers/media/platform/nxp/dw100/dw100.c                            | 2 --
  drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c                      | 2 --
  drivers/media/platform/nxp/imx-pxp.c                                | 2 --
  drivers/media/platform/nxp/imx7-media-csi.c                         | 2 --
  drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c                  | 2 --
  drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c                | 2 --
  drivers/media/platform/nxp/mx2_emmaprp.c                            | 2 --
  drivers/media/platform/qcom/camss/camss-video.c                     | 2 --
  drivers/media/platform/qcom/venus/vdec.c                            | 2 --
  drivers/media/platform/qcom/venus/venc.c                            | 2 --
  drivers/media/platform/raspberrypi/pisp_be/pisp_be.c                | 2 --
  drivers/media/platform/renesas/rcar-vin/rcar-dma.c                  | 2 --
  drivers/media/platform/renesas/rcar_drif.c                          | 2 --
  drivers/media/platform/renesas/rcar_fdp1.c                          | 2 --
  drivers/media/platform/renesas/rcar_jpu.c                           | 2 --
  drivers/media/platform/renesas/renesas-ceu.c                        | 2 --
  drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c              | 2 --
  drivers/media/platform/renesas/sh_vou.c                             | 2 --
  drivers/media/platform/renesas/vsp1/vsp1_histo.c                    | 2 --
  drivers/media/platform/renesas/vsp1/vsp1_video.c                    | 2 --
  drivers/media/platform/rockchip/rga/rga-buf.c                       | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c             | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-params.c              | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c               | 2 --
  drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c                 | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-capture.c            | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c          | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-lite.c               | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-m2m.c                | 2 --
  drivers/media/platform/samsung/s3c-camif/camif-capture.c            | 2 --
  drivers/media/platform/samsung/s5p-g2d/g2d.c                        | 2 --
  drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c                 | 2 --
  drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c                | 2 --
  drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c                | 2 --
  drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c                    | 2 --
  drivers/media/platform/st/sti/delta/delta-v4l2.c                    | 4 ----
  drivers/media/platform/st/sti/hva/hva-v4l2.c                        | 2 --
  drivers/media/platform/st/stm32/dma2d/dma2d.c                       | 2 --
  drivers/media/platform/st/stm32/stm32-dcmi.c                        | 2 --
  drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c       | 6 ------
  drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c                  | 2 --
  drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c          | 2 --
  drivers/media/platform/sunxi/sun8i-di/sun8i-di.c                    | 2 --
  drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c            | 2 --
  drivers/media/platform/ti/am437x/am437x-vpfe.c                      | 2 --
  drivers/media/platform/ti/cal/cal-video.c                           | 2 --
  drivers/media/platform/ti/davinci/vpif_capture.c                    | 2 --
  drivers/media/platform/ti/davinci/vpif_display.c                    | 2 --
  drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c               | 2 --
  drivers/media/platform/ti/omap/omap_vout.c                          | 2 --
  drivers/media/platform/ti/vpe/vpe.c                                 | 2 --
  drivers/media/platform/verisilicon/hantro_v4l2.c                    | 2 --
  drivers/media/platform/via/via-camera.c                             | 2 --
  drivers/media/platform/xilinx/xilinx-dma.c                          | 2 --
  76 files changed, 162 deletions(-)

drivers/media/platform/allegro-dvt/allegro-core.c +0 -2

index 44e0d5512f94aee8d31b74c00790548872344f2a..e491399afcc984346eb4159111f35bab5340f2b5 100644
@@ -2897,8 +2897,6 @@ static const struct vb2_ops allegro_queue_ops = {
  	.buf_queue = allegro_buf_queue,
  	.start_streaming = allegro_start_streaming,
  	.stop_streaming = allegro_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int allegro_queue_init(void *priv,

drivers/media/platform/amlogic/meson-ge2d/ge2d.c +0 -2

index b05c944d5dc2e50e8646d62a84c2971cce2f7cb5..0c004bb8ba05059245e73a306ed2d20dc18c9197 100644
@@ -391,8 +391,6 @@ static const struct vb2_ops ge2d_qops = {
  	.buf_queue = ge2d_buf_queue,
  	.start_streaming = ge2d_start_streaming,
  	.stop_streaming = ge2d_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int

drivers/media/platform/amphion/vpu_v4l2.c +0 -2

index f0b1ec79d2961cf1a5785359923bb57f1eeb21d5..45707931bc4f1fd0bce4852f97721bb7af98f44d 100644
@@ -646,8 +646,6 @@ static const struct vb2_ops vpu_vb2_ops = {
  	.start_streaming    = vpu_vb2_start_streaming,
  	.stop_streaming     = vpu_vb2_stop_streaming,
  	.buf_queue          = vpu_vb2_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  };
 
  static int vpu_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)

drivers/media/platform/aspeed/aspeed-video.c +0 -2

index fd540349811517661671ac3c5a512af2127e0d44..54cae0da9aca3fd74800b51f79136a261aec241a 100644
@@ -1891,8 +1891,6 @@ static void aspeed_video_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops aspeed_video_vb2_ops = {
  	.queue_setup = aspeed_video_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_prepare = aspeed_video_buf_prepare,
  	.start_streaming = aspeed_video_start_streaming,
  	.stop_streaming = aspeed_video_stop_streaming,

drivers/media/platform/atmel/atmel-isi.c +0 -2

index 049b7faf57900120dbea7ca213c29037e2c39360..0d1c3934752972190d8a1ded9a04b2be2b768c36 100644
@@ -526,8 +526,6 @@ static const struct vb2_ops isi_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,
  };
 
  static int isi_g_fmt_vid_cap(struct file *file, void *priv,

drivers/media/platform/broadcom/bcm2835-unicam.c +0 -2

index 6dcc6c13a7540edbd30d9244511f784527a78cf0..3aed0e493c81f1aef1ac78bd20e1fd6f69d4bd6c 100644
@@ -1801,8 +1801,6 @@ static void unicam_buffer_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops unicam_video_qops = {
  	.queue_setup		= unicam_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= unicam_buffer_prepare,
  	.start_streaming	= unicam_start_streaming,
  	.stop_streaming		= unicam_stop_streaming,

drivers/media/platform/chips-media/coda/coda-common.c +0 -2

index c3afd63edbb2a0781b9cdb5d11937d229914ae91..289a076c3bcc776faf923c24eaa0ebe3e891ee79 100644
@@ -2171,8 +2171,6 @@ static const struct vb2_ops coda_qops = {
  	.buf_queue		= coda_buf_queue,
  	.start_streaming	= coda_start_streaming,
  	.stop_streaming		= coda_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int coda_s_ctrl(struct v4l2_ctrl *ctrl)

drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0 -2

index 99e929aab8709f700e34cac625d5d70a382bd6dd..d3ff420c52ce1c30ef2b50993a295c53f72e1183 100644
@@ -1475,8 +1475,6 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops wave5_vpu_dec_vb2_ops = {
  	.queue_setup = wave5_vpu_dec_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = wave5_vpu_dec_buf_queue,
  	.start_streaming = wave5_vpu_dec_start_streaming,
  	.stop_streaming = wave5_vpu_dec_stop_streaming,

drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +0 -2

index 4e1c8a4e72728b769dcd216c92803a61fd3f4515..1e5fc5f8b856c5329b2c6007649285a28749b6aa 100644
@@ -1471,8 +1471,6 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops wave5_vpu_enc_vb2_ops = {
  	.queue_setup = wave5_vpu_enc_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = wave5_vpu_enc_buf_queue,
  	.start_streaming = wave5_vpu_enc_start_streaming,
  	.stop_streaming = wave5_vpu_enc_stop_streaming,

drivers/media/platform/imagination/e5010-jpeg-enc.c +0 -2

index 25044f15672e9b95265c1c04c82f66c6622a7520..c194f830577f9a2ed313e76f536e5d078729a3a3 100644
@@ -1593,8 +1593,6 @@ static const struct vb2_ops e5010_video_ops = {
  	.buf_finish = e5010_buf_finish,
  	.buf_prepare = e5010_buf_prepare,
  	.buf_out_validate = e5010_buf_out_validate,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = e5010_start_streaming,
  	.stop_streaming = e5010_stop_streaming,
  };

drivers/media/platform/intel/pxa_camera.c +0 -2

index b8b1cf0665ab60786585d2dd7d0cb2caa4ba2a84..bef1e7137f23f02ef0005058c59fb712ba467cea 100644
@@ -1504,8 +1504,6 @@ static const struct vb2_ops pxac_vb2_ops = {
  	.buf_cleanup		= pxac_vb2_cleanup,
  	.start_streaming	= pxac_vb2_start_streaming,
  	.stop_streaming		= pxac_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int pxa_camera_init_videobuf2(struct pxa_camera_dev *pcdev)

drivers/media/platform/m2m-deinterlace.c +0 -2

index 7d331c37525a4aa98ec02d2d477ef7d622e87664..5188f31890966735c6eba990587627f43ff84378 100644
@@ -784,8 +784,6 @@ static const struct vb2_ops deinterlace_qops = {
  	.queue_setup	 = deinterlace_queue_setup,
  	.buf_prepare	 = deinterlace_buf_prepare,
  	.buf_queue	 = deinterlace_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/marvell/mcam-core.c +0 -4

index c81593c969e057f7efb24666f48f6ac9fdf06ed1..9ec01228f907311f1034523f06a2704a3b70b902 100644
@@ -1203,8 +1203,6 @@ static const struct vb2_ops mcam_vb2_ops = {
  	.buf_queue		= mcam_vb_buf_queue,
  	.start_streaming	= mcam_vb_start_streaming,
  	.stop_streaming		= mcam_vb_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
 

@@ -1267,8 +1265,6 @@ static const struct vb2_ops mcam_vb2_sg_ops = {
  	.buf_cleanup		= mcam_vb_sg_buf_cleanup,
  	.start_streaming	= mcam_vb_start_streaming,
  	.stop_streaming		= mcam_vb_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  #endif /* MCAM_MODE_DMA_SG */

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +0 -4

index a5bf75eb8b221245b53a2fc08d5514b6ba9d25f0..834d2a354692df120b81ee0bef7f816a4529a2f4 100644
@@ -884,8 +884,6 @@ static const struct vb2_ops mtk_jpeg_dec_qops = {
  	.queue_setup        = mtk_jpeg_queue_setup,
  	.buf_prepare        = mtk_jpeg_buf_prepare,
  	.buf_queue          = mtk_jpeg_dec_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  	.stop_streaming     = mtk_jpeg_dec_stop_streaming,
  };
 

@@ -893,8 +891,6 @@ static const struct vb2_ops mtk_jpeg_enc_qops = {
  	.queue_setup        = mtk_jpeg_queue_setup,
  	.buf_prepare        = mtk_jpeg_buf_prepare,
  	.buf_queue          = mtk_jpeg_enc_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  	.stop_streaming     = mtk_jpeg_enc_stop_streaming,
  };
 

drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c +0 -2

index f14779e7596e51057079472bf57588813ff3c39d..28c998bd3a81c440bc273ba0a09bf31e3460d8e1 100644
@@ -584,8 +584,6 @@ static const struct vb2_ops mtk_mdp_m2m_qops = {
  	.buf_queue	 = mtk_mdp_m2m_buf_queue,
  	.stop_streaming	 = mtk_mdp_m2m_stop_streaming,
  	.start_streaming = mtk_mdp_m2m_start_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int mtk_mdp_m2m_querycap(struct file *file, void *fh,

drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c +0 -2

index 0e69128a3772c38135ab8348063ae1306e7155c9..59ce5cce069836a6902df686f4dd91b13fa729f2 100644
@@ -266,8 +266,6 @@ static void mdp_m2m_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops mdp_m2m_qops = {
  	.queue_setup	= mdp_m2m_queue_setup,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  	.buf_prepare	= mdp_m2m_buf_prepare,
  	.start_streaming = mdp_m2m_start_streaming,
  	.stop_streaming	= mdp_m2m_stop_streaming,

drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateful.c +0 -2

index e62c1c18758bb18f518de88633995bcf4955781d..aa9bdee7a96ca97bd92846edd79643b428ff5948 100644
@@ -598,8 +598,6 @@ static void mtk_init_vdec_params(struct mtk_vcodec_dec_ctx *ctx)
  static const struct vb2_ops mtk_vdec_frame_vb2_ops = {
  	.queue_setup = vb2ops_vdec_queue_setup,
  	.buf_prepare = vb2ops_vdec_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = vb2ops_vdec_start_streaming,
 
  	.buf_queue = vb2ops_vdec_stateful_buf_queue,

drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c +0 -2

index 3307dc15fc1dfee96362239f2096190c57a0be10..afa224da0f4165cf5701d6861f1f787c6317bfe4 100644
@@ -856,8 +856,6 @@ static int vb2ops_vdec_out_buf_validate(struct vb2_buffer *vb)
 
  static const struct vb2_ops mtk_vdec_request_vb2_ops = {
  	.queue_setup	= vb2ops_vdec_queue_setup,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  	.start_streaming	= vb2ops_vdec_start_streaming,
  	.stop_streaming	= vb2ops_vdec_stop_streaming,
 

drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0 -2

index 7eaf0e24c9fc41bf8f431c885417ff348299c2eb..a01dc25a769911cd85a8d19c58e0c0a12b92ad50 100644
@@ -1009,8 +1009,6 @@ static const struct vb2_ops mtk_venc_vb2_ops = {
  	.buf_out_validate	= vb2ops_venc_buf_out_validate,
  	.buf_prepare		= vb2ops_venc_buf_prepare,
  	.buf_queue		= vb2ops_venc_buf_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= vb2ops_venc_start_streaming,
  	.stop_streaming		= vb2ops_venc_stop_streaming,
  };

drivers/media/platform/microchip/microchip-isc-base.c +0 -2

index 28e56f6a695da2a6e4035fbe99b80ff65e95517e..a7cdc743fda71db0ffbf499cb4b9ca18c9e7abf2 100644
@@ -465,8 +465,6 @@ static void isc_buffer_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops isc_vb2_ops = {
  	.queue_setup		= isc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= isc_buffer_prepare,
  	.start_streaming	= isc_start_streaming,
  	.stop_streaming		= isc_stop_streaming,

drivers/media/platform/nuvoton/npcm-video.c +0 -2

index 3b527029cbbbb22e77724df8557d4944924c3939..4f5d75645b2bb94669d976f9bfe7a9870f92c481 100644
@@ -1558,8 +1558,6 @@ static const struct regmap_config npcm_video_ece_regmap_cfg = {
 
  static const struct vb2_ops npcm_video_vb2_ops = {
  	.queue_setup = npcm_video_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_prepare = npcm_video_buf_prepare,
  	.buf_finish = npcm_video_buf_finish,
  	.start_streaming = npcm_video_start_streaming,

drivers/media/platform/nvidia/tegra-vde/v4l2.c +0 -2

index ebf882198eeeb71e316a2d10985067fb897532e8..e3726cab0c82c92cf0d552b8e8061fd22badfa90 100644
@@ -328,8 +328,6 @@ static const struct vb2_ops tegra_qops = {
  	.buf_request_complete = tegra_buf_request_complete,
  	.start_streaming = tegra_start_streaming,
  	.stop_streaming = tegra_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int tegra_queue_init(void *priv,

drivers/media/platform/nxp/dw100/dw100.c +0 -2

index 54ebf59df682e067a5035c5ff399091642c77c97..66582e7f92fc6c0751afcc302dfe94f049a88b87 100644
@@ -558,8 +558,6 @@ static const struct vb2_ops dw100_qops = {
  	.buf_queue	 = dw100_buf_queue,
  	.start_streaming = dw100_start_streaming,
  	.stop_streaming  = dw100_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int dw100_m2m_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +0 -2

index d8e946aebba276139245de1475b4c54a9fc381ac..7f5fe551179b9eb27a3e6846f57d083dd5323ffc 100644
@@ -1965,8 +1965,6 @@ static int mxc_jpeg_buf_prepare(struct vb2_buffer *vb)
 
  static const struct vb2_ops mxc_jpeg_qops = {
  	.queue_setup		= mxc_jpeg_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_out_validate	= mxc_jpeg_buf_out_validate,
  	.buf_prepare		= mxc_jpeg_buf_prepare,
  	.start_streaming	= mxc_jpeg_start_streaming,

drivers/media/platform/nxp/imx-pxp.c +0 -2

index e696d377960f9a2c554db2ad2956e8763fdfbead..7f8ffbac582fcf6a968e5ab000827d7086c18261 100644
@@ -1606,8 +1606,6 @@ static const struct vb2_ops pxp_qops = {
  	.buf_queue	 = pxp_buf_queue,
  	.start_streaming = pxp_start_streaming,
  	.stop_streaming  = pxp_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/nxp/imx7-media-csi.c +0 -2

index 08e36b7bab59ebd4b2b2ed77158055f86429adf1..34a92642bbfe7b7ce9c85fbaf346c6f595425cc9 100644
@@ -1507,8 +1507,6 @@ static const struct vb2_ops imx7_csi_video_qops = {
  	.buf_init        = imx7_csi_video_buf_init,
  	.buf_prepare	 = imx7_csi_video_buf_prepare,
  	.buf_queue	 = imx7_csi_video_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = imx7_csi_video_start_streaming,
  	.stop_streaming  = imx7_csi_video_stop_streaming,
  };

drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c +0 -2

index 9745d6219a1667f28c2b290ded1c7739bee8c2ba..794050a6a919b8d108e4585d6be5ffd519e1311f 100644
@@ -269,8 +269,6 @@ static const struct vb2_ops mxc_isi_m2m_vb2_qops = {
  	.buf_init		= mxc_isi_m2m_vb2_buffer_init,
  	.buf_prepare		= mxc_isi_m2m_vb2_buffer_prepare,
  	.buf_queue		= mxc_isi_m2m_vb2_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= mxc_isi_m2m_vb2_start_streaming,
  	.stop_streaming		= mxc_isi_m2m_vb2_stop_streaming,
  };

drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c +0 -2

index 4091f1c0e78bdca91e66d3d63e96da0e3d2ad5af..c0ba34ea82fd799a4efbd723f6cd459ca1572283 100644
@@ -987,8 +987,6 @@ static const struct vb2_ops mxc_isi_vb2_qops = {
  	.buf_init		= mxc_isi_vb2_buffer_init,
  	.buf_prepare		= mxc_isi_vb2_buffer_prepare,
  	.buf_queue		= mxc_isi_vb2_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= mxc_isi_vb2_start_streaming,
  	.stop_streaming		= mxc_isi_vb2_stop_streaming,
  };

drivers/media/platform/nxp/mx2_emmaprp.c +0 -2

index bcad0aed7206e28651b54caf8d456d748aeb9abc..0c6cc120fd2a443db4dbc583f2cdb1cfd61b6a7e 100644
@@ -677,8 +677,6 @@ static const struct vb2_ops emmaprp_qops = {
  	.queue_setup	 = emmaprp_queue_setup,
  	.buf_prepare	 = emmaprp_buf_prepare,
  	.buf_queue	 = emmaprp_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/qcom/camss/camss-video.c +0 -2

index 3b8fc31d957c77fcfd19790f066b4025b1a7ea51..aa021fd5e1233ba413acc9fdbac6b677619079b4 100644
@@ -310,8 +310,6 @@ static void video_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops msm_video_vb2_q_ops = {
  	.queue_setup     = video_queue_setup,
-	.wait_prepare    = vb2_ops_wait_prepare,
-	.wait_finish     = vb2_ops_wait_finish,
  	.buf_init        = video_buf_init,
  	.buf_prepare     = video_buf_prepare,
  	.buf_queue       = video_buf_queue,

drivers/media/platform/qcom/venus/vdec.c +0 -2

index 6252a6b3d4ba6d49b343bb53dfb7b0e683410bb4..fd4c4934c910383539c59948df9fdc39f62a2d1f 100644
@@ -1390,8 +1390,6 @@ static const struct vb2_ops vdec_vb2_ops = {
  	.buf_prepare = venus_helper_vb2_buf_prepare,
  	.start_streaming = vdec_start_streaming,
  	.stop_streaming = vdec_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = vdec_vb2_buf_queue,
  };
 

drivers/media/platform/qcom/venus/venc.c +0 -2

index 322a7737e2c7befdebcdf147955ba1d5ba8b42e2..b1093683c3063807e597a465fd1f80c2bf0d76f1 100644
@@ -1319,8 +1319,6 @@ static const struct vb2_ops venc_vb2_ops = {
  	.buf_prepare = venus_helper_vb2_buf_prepare,
  	.start_streaming = venc_start_streaming,
  	.stop_streaming = venus_helper_vb2_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = venc_vb2_buf_queue,
  };
 

drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0 -2

index 89e36e8219ed8b7cc4040ae1f33ec21bb12778d6..7596ae1f7de6671484d4d351015b234829f642d4 100644
@@ -964,8 +964,6 @@ static const struct vb2_ops pispbe_node_queue_ops = {
  	.buf_queue = pispbe_node_buffer_queue,
  	.start_streaming = pispbe_node_start_streaming,
  	.stop_streaming = pispbe_node_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static const struct v4l2_file_operations pispbe_fops = {

drivers/media/platform/renesas/rcar-vin/rcar-dma.c +0 -2

index 21d5b2815e86a66a1786901586f18f5474b94ad0..39cf22376fbe0a4c0ea761272d3c8c302a6e51c0 100644
@@ -1529,8 +1529,6 @@ static const struct vb2_ops rvin_qops = {
  	.buf_queue		= rvin_buffer_queue,
  	.start_streaming	= rvin_start_streaming_vq,
  	.stop_streaming		= rvin_stop_streaming_vq,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  void rvin_dma_unregister(struct rvin_dev *vin)

drivers/media/platform/renesas/rcar_drif.c +0 -2

index a7b882975440d0ae0e81fe1b20d1d02affcf97f1..fc8b6bbef793c64e63f8750eadbcf0cbe43f9c41 100644
@@ -861,8 +861,6 @@ static const struct vb2_ops rcar_drif_vb2_ops = {
  	.buf_queue              = rcar_drif_buf_queue,
  	.start_streaming        = rcar_drif_start_streaming,
  	.stop_streaming         = rcar_drif_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int rcar_drif_querycap(struct file *file, void *fh,

drivers/media/platform/renesas/rcar_fdp1.c +0 -2

index 5827cc33ab50fd05f1e7312ca3f6de070d15c76d..5d453a7a89889fa3fd115da5f87b4bb24554a3c6 100644
@@ -2032,8 +2032,6 @@ static const struct vb2_ops fdp1_qops = {
  	.buf_queue	 = fdp1_buf_queue,
  	.start_streaming = fdp1_start_streaming,
  	.stop_streaming  = fdp1_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/renesas/rcar_jpu.c +0 -2

index 881df8a8a1ac8521d615512320d963debc6a040a..1421364d2d14d2dac3cd5afd63377d9005926044 100644
@@ -1171,8 +1171,6 @@ static const struct vb2_ops jpu_qops = {
  	.buf_finish		= jpu_buf_finish,
  	.start_streaming	= jpu_start_streaming,
  	.stop_streaming		= jpu_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int jpu_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/renesas/renesas-ceu.c +0 -2

index cacfa3951c4d52b34c7eb9d587540d744f519804..8cceafe491b1bec6c10ced8e0336b5575db88297 100644
@@ -761,8 +761,6 @@ static const struct vb2_ops ceu_vb2_ops = {
  	.queue_setup		= ceu_vb2_setup,
  	.buf_queue		= ceu_vb2_queue,
  	.buf_prepare		= ceu_vb2_prepare,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= ceu_start_streaming,
  	.stop_streaming		= ceu_stop_streaming,
  };

drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +0 -2

index b16b8af6e8f8cb067fbdd71cf9b49cb4784eaaea..128694c0b144181cdfb26062cd2d92c831d884d1 100644
@@ -712,8 +712,6 @@ static const struct vb2_ops rzg2l_cru_qops = {
  	.buf_queue		= rzg2l_cru_buffer_queue,
  	.start_streaming	= rzg2l_cru_start_streaming_vq,
  	.stop_streaming		= rzg2l_cru_stop_streaming_vq,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  void rzg2l_cru_dma_unregister(struct rzg2l_cru_dev *cru)

drivers/media/platform/renesas/sh_vou.c +0 -2

index d440e54599195bf72bbeeeff221138a3d3902e05..4ad7ae188d5b25ab383d664898f855a4819c1a85 100644
@@ -360,8 +360,6 @@ static const struct vb2_ops sh_vou_qops = {
  	.buf_queue		= sh_vou_buf_queue,
  	.start_streaming	= sh_vou_start_streaming,
  	.stop_streaming		= sh_vou_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* Video IOCTLs */

drivers/media/platform/renesas/vsp1/vsp1_histo.c +0 -2

index 9c2d4c91bfadb8f19773fca511014c29f326c41d..c762202877babdc651a63997f4340f6a37a301ac 100644
@@ -155,8 +155,6 @@ static const struct vb2_ops histo_video_queue_qops = {
  	.queue_setup = histo_queue_setup,
  	.buf_prepare = histo_buffer_prepare,
  	.buf_queue = histo_buffer_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = histo_start_streaming,
  	.stop_streaming = histo_stop_streaming,
  };

drivers/media/platform/renesas/vsp1/vsp1_video.c +0 -2

index e728f9f5160e42f2cf8956cd4180c0ce2162073b..03f4efd6b82bd76419ff048f24c82ecce44f321c 100644
@@ -873,8 +873,6 @@ static const struct vb2_ops vsp1_video_queue_qops = {
  	.queue_setup = vsp1_video_queue_setup,
  	.buf_prepare = vsp1_video_buffer_prepare,
  	.buf_queue = vsp1_video_buffer_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = vsp1_video_start_streaming,
  	.stop_streaming = vsp1_video_stop_streaming,
  };

drivers/media/platform/rockchip/rga/rga-buf.c +0 -2

index 70808049d2e810dadc76d2adfa366ec4f4d046a9..8a48e9d91f96f1afbcc5367e6bd00898729a3be2 100644
@@ -218,8 +218,6 @@ const struct vb2_ops rga_qops = {
  	.buf_prepare = rga_buf_prepare,
  	.buf_queue = rga_buf_queue,
  	.buf_cleanup = rga_buf_cleanup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = rga_buf_start_streaming,
  	.stop_streaming = rga_buf_stop_streaming,
  };

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +0 -2

index 2bddb4fa8a5cd163f383a9baa9fc3e2ca1ea87b8..02339cd94486ab2b669c966895c83d7dcc2d2b94 100644
@@ -1203,8 +1203,6 @@ static const struct vb2_ops rkisp1_vb2_ops = {
  	.buf_init = rkisp1_vb2_buf_init,
  	.buf_queue = rkisp1_vb2_buf_queue,
  	.buf_prepare = rkisp1_vb2_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = rkisp1_vb2_stop_streaming,
  	.start_streaming = rkisp1_vb2_start_streaming,
  };

drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +0 -2

index 320581a9f866e919c1bf0cf64d34d20ea08c02d3..b28f4140c8a309a3231d44d825c6461e3ecb2a44 100644
@@ -2704,8 +2704,6 @@ static const struct vb2_ops rkisp1_params_vb2_ops = {
  	.queue_setup = rkisp1_params_vb2_queue_setup,
  	.buf_init = rkisp1_params_vb2_buf_init,
  	.buf_cleanup = rkisp1_params_vb2_buf_cleanup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = rkisp1_params_vb2_buf_queue,
  	.buf_prepare = rkisp1_params_vb2_buf_prepare,
  	.stop_streaming = rkisp1_params_vb2_stop_streaming,

drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +0 -2

index a502719e916a92bcf4cbc53bc0895e591e23a894..d5fdb8f82dc78b0143f71d76f36817db389921b7 100644
@@ -150,8 +150,6 @@ static const struct vb2_ops rkisp1_stats_vb2_ops = {
  	.queue_setup = rkisp1_stats_vb2_queue_setup,
  	.buf_queue = rkisp1_stats_vb2_buf_queue,
  	.buf_prepare = rkisp1_stats_vb2_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = rkisp1_stats_vb2_stop_streaming,
  };
 

drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c +0 -2

index b7854ce5fb8e34f51b70f7392caf2ccb1cf0d7ba..4bda1c369c44c41265a42f2bab6f70ec532881bd 100644
@@ -276,8 +276,6 @@ static const struct vb2_ops gsc_m2m_qops = {
  	.queue_setup	 = gsc_m2m_queue_setup,
  	.buf_prepare	 = gsc_m2m_buf_prepare,
  	.buf_queue	 = gsc_m2m_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.stop_streaming	 = gsc_m2m_stop_streaming,
  	.start_streaming = gsc_m2m_start_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-capture.c +0 -2

index ffa4ea21387da39136d9dcfdb02a6a7cfe6edebc..c3c2e474a18a725fd196ae29d107bc056d4a0932 100644
@@ -455,8 +455,6 @@ static const struct vb2_ops fimc_capture_qops = {
  	.queue_setup		= queue_setup,
  	.buf_prepare		= buffer_prepare,
  	.buf_queue		= buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= start_streaming,
  	.stop_streaming		= stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c +0 -2

index 06c4352562b38fb7cce395b31698f3798b06bc77..ad219ac1b95137a703ea709d12139cca6b2e2332 100644
@@ -255,8 +255,6 @@ static const struct vb2_ops isp_video_capture_qops = {
  	.queue_setup	 = isp_video_capture_queue_setup,
  	.buf_prepare	 = isp_video_capture_buffer_prepare,
  	.buf_queue	 = isp_video_capture_buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = isp_video_capture_start_streaming,
  	.stop_streaming	 = isp_video_capture_stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-lite.c +0 -2

index e362719612d2f88c32f284ba97d614eed74009ab..f23e51e3da2fe520683a556b2e912e1e3cedff95 100644
@@ -441,8 +441,6 @@ static const struct vb2_ops fimc_lite_qops = {
  	.queue_setup	 = queue_setup,
  	.buf_prepare	 = buffer_prepare,
  	.buf_queue	 = buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = start_streaming,
  	.stop_streaming	 = stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-m2m.c +0 -2

index 199997eec1cc25bbc3872c960e323128fac430d2..951433c8e92a5b75bad59f2e0dbf7d56f6726dee 100644
@@ -216,8 +216,6 @@ static const struct vb2_ops fimc_qops = {
  	.queue_setup	 = fimc_queue_setup,
  	.buf_prepare	 = fimc_buf_prepare,
  	.buf_queue	 = fimc_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.stop_streaming	 = stop_streaming,
  	.start_streaming = start_streaming,
  };

drivers/media/platform/samsung/s3c-camif/camif-capture.c +0 -2

index be58260ea67e797f44326c7d8140aeb66da1d8b9..bd1149e8abc2d2fb923f5a11368c388f6a23dbd6 100644
@@ -525,8 +525,6 @@ static const struct vb2_ops s3c_camif_qops = {
  	.queue_setup	 = queue_setup,
  	.buf_prepare	 = buffer_prepare,
  	.buf_queue	 = buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = start_streaming,
  	.stop_streaming	 = stop_streaming,
  };

drivers/media/platform/samsung/s5p-g2d/g2d.c +0 -2

index e5e55a41bf3e853d82001074ba285224988c4735..ffed16a34493be2edbdaee13619467417487c1e7 100644
@@ -133,8 +133,6 @@ static const struct vb2_ops g2d_qops = {
  	.queue_setup	= g2d_queue_setup,
  	.buf_prepare	= g2d_buf_prepare,
  	.buf_queue	= g2d_buf_queue,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c +0 -2

index 30a6144f2c770db9197e053871971eed2d1eb331..71d7a1d853a87e2eff27102927a42bdae757619c 100644
@@ -2590,8 +2590,6 @@ static const struct vb2_ops s5p_jpeg_qops = {
  	.queue_setup		= s5p_jpeg_queue_setup,
  	.buf_prepare		= s5p_jpeg_buf_prepare,
  	.buf_queue		= s5p_jpeg_buf_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= s5p_jpeg_start_streaming,
  	.stop_streaming		= s5p_jpeg_stop_streaming,
  };

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c +0 -2

index 91e102d4ec4e2ad9f432c662561e565de6cdc39e..3efbc336790629425c2a71e9feee8f073db55790 100644
@@ -1161,8 +1161,6 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops s5p_mfc_dec_qops = {
  	.queue_setup		= s5p_mfc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_init		= s5p_mfc_buf_init,
  	.start_streaming	= s5p_mfc_start_streaming,
  	.stop_streaming		= s5p_mfc_stop_streaming,

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c +0 -2

index 81cbb36fb382c0a0644730e7eb87b61884a8ed03..6c603dcd56649fcabe161173c64b9ea8bd055b93 100644
@@ -2652,8 +2652,6 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops s5p_mfc_enc_qops = {
  	.queue_setup		= s5p_mfc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_init		= s5p_mfc_buf_init,
  	.buf_prepare		= s5p_mfc_buf_prepare,
  	.start_streaming	= s5p_mfc_start_streaming,

drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c +0 -2

index 3b0066cf2eb0899e74a227554129839656bac6f1..73ad66ed20f2e3201e8ceb1d2ff9aff1ad873c92 100644
@@ -531,8 +531,6 @@ static const struct vb2_ops bdisp_qops = {
  	.queue_setup     = bdisp_queue_setup,
  	.buf_prepare     = bdisp_buf_prepare,
  	.buf_queue       = bdisp_buf_queue,
-	.wait_prepare    = vb2_ops_wait_prepare,
-	.wait_finish     = vb2_ops_wait_finish,
  	.stop_streaming  = bdisp_stop_streaming,
  	.start_streaming = bdisp_start_streaming,
  };

drivers/media/platform/st/sti/delta/delta-v4l2.c +0 -4

index fdee7fae3a20133b002932c80372ab92c83c7ae5..196e6a40335d14898ff7abbb38d2de2f5bcf6789 100644
@@ -1559,8 +1559,6 @@ static const struct vb2_ops delta_vb2_au_ops = {
  	.queue_setup = delta_vb2_au_queue_setup,
  	.buf_prepare = delta_vb2_au_prepare,
  	.buf_queue = delta_vb2_au_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = delta_vb2_au_start_streaming,
  	.stop_streaming = delta_vb2_au_stop_streaming,
  };

@@ -1570,8 +1568,6 @@ static const struct vb2_ops delta_vb2_frame_ops = {
  	.buf_prepare = delta_vb2_frame_prepare,
  	.buf_finish = delta_vb2_frame_finish,
  	.buf_queue = delta_vb2_frame_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = delta_vb2_frame_stop_streaming,
  };
 

drivers/media/platform/st/sti/hva/hva-v4l2.c +0 -2

index 31a94300d6457b8da689e26004d906c11588d8c0..5366c0f92549bb090967a1337ce55d0b0f1d76ce 100644
@@ -1114,8 +1114,6 @@ static const struct vb2_ops hva_qops = {
  	.buf_queue		= hva_buf_queue,
  	.start_streaming	= hva_start_streaming,
  	.stop_streaming		= hva_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /*

drivers/media/platform/st/stm32/dma2d/dma2d.c +0 -2

index 643bda7f9f7d10a4a6b282babfb1504f85c3af5c..b6c8400fb92da974d95bd74770bd8196b5be0dc0 100644
@@ -186,8 +186,6 @@ static const struct vb2_ops dma2d_qops = {
  	.buf_queue	= dma2d_buf_queue,
  	.start_streaming = dma2d_start_streaming,
  	.stop_streaming  = dma2d_stop_streaming,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/st/stm32/stm32-dcmi.c +0 -2

index a28db89e4b50f739fb5f5f821ac4176bd856b4f5..9b699ee2b1e0614c22f68da2709b54c85e5024bd 100644
@@ -898,8 +898,6 @@ static const struct vb2_ops dcmi_video_qops = {
  	.buf_queue		= dcmi_buf_queue,
  	.start_streaming	= dcmi_start_streaming,
  	.stop_streaming		= dcmi_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int dcmi_g_fmt_vid_cap(struct file *file, void *priv,

drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c +0 -6

index 9f768f011fa25a0981cd0d1d3f114b02e58223d4..7edd49bfe7e5b8d6962777291f82e21131f1fae2 100644
@@ -625,12 +625,6 @@ static const struct vb2_ops dcmipp_bytecap_qops = {
  	.buf_prepare		= dcmipp_bytecap_buf_prepare,
  	.buf_queue		= dcmipp_bytecap_buf_queue,
  	.queue_setup		= dcmipp_bytecap_queue_setup,
-	/*
-	 * Since q->lock is set we can use the standard
-	 * vb2_ops_wait_prepare/finish helper functions.
-	 */
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static void dcmipp_bytecap_release(struct video_device *vdev)

drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +0 -2

index d1371e13011374ef78874f723a424ed8bb42ed79..e911c7f7acc5245b92ce20a9c2f8a16516eeb901 100644
@@ -371,8 +371,6 @@ static const struct vb2_ops sun4i_csi_qops = {
  	.buf_queue		= sun4i_csi_buffer_queue,
  	.start_streaming	= sun4i_csi_start_streaming,
  	.stop_streaming		= sun4i_csi_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static irqreturn_t sun4i_csi_irq(int irq, void *data)

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +0 -2

index 14c0dc827c5200d854022680e3867a2604e863ad..76356bc7f10e396253b24a3a73d942d6a045942f 100644
@@ -657,8 +657,6 @@ static const struct vb2_ops sun6i_csi_capture_queue_ops = {
  	.buf_queue		= sun6i_csi_capture_buffer_queue,
  	.start_streaming	= sun6i_csi_capture_start_streaming,
  	.stop_streaming		= sun6i_csi_capture_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* V4L2 Device */

drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +0 -2

index c55b1761b089778b3ace385da331fa81585ec3d6..3e7f2df70408b882f6c9d47b66a8e092f6960927 100644
@@ -659,8 +659,6 @@ static const struct vb2_ops deinterlace_qops = {
  	.buf_queue		= deinterlace_buf_queue,
  	.start_streaming	= deinterlace_start_streaming,
  	.stop_streaming		= deinterlace_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int deinterlace_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c +0 -2

index d60d3496e5b4d6821e1dce42d7f79560a8485179..abd10b218aa1dc552004fe7ebcb815b3d6b8a43d 100644
@@ -522,8 +522,6 @@ static const struct vb2_ops rotate_qops = {
  	.buf_queue		= rotate_buf_queue,
  	.start_streaming	= rotate_start_streaming,
  	.stop_streaming		= rotate_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int rotate_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/ti/am437x/am437x-vpfe.c +0 -2

index edbe0620ecaadf0b53852a6ebc5e983a33a171b9..44cdccb8937752964a0787d192d9b7fc0f5efbf9 100644
@@ -2079,8 +2079,6 @@ static long vpfe_ioctl_default(struct file *file, void *priv,
  }
 
  static const struct vb2_ops vpfe_video_qops = {
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.queue_setup		= vpfe_queue_setup,
  	.buf_prepare		= vpfe_buffer_prepare,
  	.buf_queue		= vpfe_buffer_queue,

drivers/media/platform/ti/cal/cal-video.c +0 -2

index e1ba5dfc217e3ac9421cb749cce78c87c9e75a6c..e29743ae61e27ea6d11d3555aaf370d747fbbad9 100644
@@ -808,8 +808,6 @@ static const struct vb2_ops cal_video_qops = {
  	.buf_queue		= cal_buffer_queue,
  	.start_streaming	= cal_start_streaming,
  	.stop_streaming		= cal_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* ------------------------------------------------------------------

drivers/media/platform/ti/davinci/vpif_capture.c +0 -2

index 8357450b3f01a7da387b8fcb46fe6de765f56568..d053972888d1b43161e99a04c4ca5e11664bf5b8 100644
@@ -310,8 +310,6 @@ static const struct vb2_ops video_qops = {
  	.start_streaming	= vpif_start_streaming,
  	.stop_streaming		= vpif_stop_streaming,
  	.buf_queue		= vpif_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /**

drivers/media/platform/ti/davinci/vpif_display.c +0 -2

index bea47e5159de06a9ee537524dee97c7d136e564d..70c89549f4b61d79bb72157e722e1984a4fca68e 100644
@@ -293,8 +293,6 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
 
  static const struct vb2_ops video_qops = {
  	.queue_setup		= vpif_buffer_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= vpif_buffer_prepare,
  	.start_streaming	= vpif_start_streaming,
  	.stop_streaming		= vpif_stop_streaming,

drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c +0 -2

index bd9c9e6ac573af2a564ef1c18feedec0544b64ec..9a4a72331b4f2d578d03b74f16f4c6625608510d 100644
@@ -878,8 +878,6 @@ static const struct vb2_ops csi_vb2_qops = {
  	.buf_queue = ti_csi2rx_buffer_queue,
  	.start_streaming = ti_csi2rx_start_streaming,
  	.stop_streaming = ti_csi2rx_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int ti_csi2rx_init_vb2q(struct ti_csi2rx_dev *csi)

drivers/media/platform/ti/omap/omap_vout.c +0 -2

index 85dca219042895b686a8c3b9f770f84186dbe478..a87d5030ac35ced841efa1d4e940b26594a8a275 100644
@@ -1300,8 +1300,6 @@ static const struct vb2_ops omap_vout_vb2_ops = {
  	.buf_prepare		= omap_vout_vb2_prepare,
  	.start_streaming	= omap_vout_vb2_start_streaming,
  	.stop_streaming		= omap_vout_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* Init functions used during driver initialization */

drivers/media/platform/ti/vpe/vpe.c +0 -2

index bd2e97afd776121e5d0813fc722b136eb902f5ec..636d76ecebcd7e6f4e98d6fe4873bf98b0f0239e 100644
@@ -2210,8 +2210,6 @@ static const struct vb2_ops vpe_qops = {
  	.queue_setup	 = vpe_queue_setup,
  	.buf_prepare	 = vpe_buf_prepare,
  	.buf_queue	 = vpe_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = vpe_start_streaming,
  	.stop_streaming  = vpe_stop_streaming,
  };

drivers/media/platform/verisilicon/hantro_v4l2.c +0 -2

index 32f69c6c703bf4af680c92557f0a5f6d9f4c715f..2513adfbd82595632d5e797a71501153d557c5d1 100644
@@ -1004,6 +1004,4 @@ const struct vb2_ops hantro_queue_ops = {
  	.buf_request_complete = hantro_buf_request_complete,
  	.start_streaming = hantro_start_streaming,
  	.stop_streaming = hantro_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };

drivers/media/platform/via/via-camera.c +0 -2

index 195e9bf1eedf69c0d27b3a0471a8354599e07853..5702eff664d4ef652b22aaeaaacbbd0e16a2e137 100644
@@ -666,8 +666,6 @@ static const struct vb2_ops viacam_vb2_ops = {
  	.buf_prepare		= viacam_vb2_prepare,
  	.start_streaming	= viacam_vb2_start_streaming,
  	.stop_streaming		= viacam_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* --------------------------------------------------------------------------*/

drivers/media/platform/xilinx/xilinx-dma.c +0 -0

index a1687b868a445228e33373fa7b268dd44ecebab7..18bfa6001909dfa6efc23b3ca432a39a1b316afc 100644

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 <[email protected]>

---
  drivers/media/platform/allegro-dvt/allegro-core.c                   | 2 --
  drivers/media/platform/amlogic/meson-ge2d/ge2d.c                    | 2 --
  drivers/media/platform/amphion/vpu_v4l2.c                           | 2 --
  drivers/media/platform/aspeed/aspeed-video.c                        | 2 --
  drivers/media/platform/atmel/atmel-isi.c                            | 2 --
  drivers/media/platform/broadcom/bcm2835-unicam.c                    | 2 --
  drivers/media/platform/chips-media/coda/coda-common.c               | 2 --
  drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c            | 2 --
  drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c            | 2 --
  drivers/media/platform/imagination/e5010-jpeg-enc.c                 | 2 --
  drivers/media/platform/intel/pxa_camera.c                           | 2 --
  drivers/media/platform/m2m-deinterlace.c                            | 2 --
  drivers/media/platform/marvell/mcam-core.c                          | 4 ----
  drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c                | 4 ----
  drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c                   | 2 --
  drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c                 | 2 --
  .../platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateful.c      | 2 --
  .../platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c     | 2 --
  drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c     | 2 --
  drivers/media/platform/microchip/microchip-isc-base.c               | 2 --
  drivers/media/platform/nuvoton/npcm-video.c                         | 2 --
  drivers/media/platform/nvidia/tegra-vde/v4l2.c                      | 2 --
  drivers/media/platform/nxp/dw100/dw100.c                            | 2 --
  drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c                      | 2 --
  drivers/media/platform/nxp/imx-pxp.c                                | 2 --
  drivers/media/platform/nxp/imx7-media-csi.c                         | 2 --
  drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c                  | 2 --
  drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c                | 2 --
  drivers/media/platform/nxp/mx2_emmaprp.c                            | 2 --
  drivers/media/platform/qcom/camss/camss-video.c                     | 2 --
  drivers/media/platform/qcom/venus/vdec.c                            | 2 --
  drivers/media/platform/qcom/venus/venc.c                            | 2 --
  drivers/media/platform/raspberrypi/pisp_be/pisp_be.c                | 2 --
  drivers/media/platform/renesas/rcar-vin/rcar-dma.c                  | 2 --
  drivers/media/platform/renesas/rcar_drif.c                          | 2 --
  drivers/media/platform/renesas/rcar_fdp1.c                          | 2 --
  drivers/media/platform/renesas/rcar_jpu.c                           | 2 --
  drivers/media/platform/renesas/renesas-ceu.c                        | 2 --
  drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c              | 2 --
  drivers/media/platform/renesas/sh_vou.c                             | 2 --
  drivers/media/platform/renesas/vsp1/vsp1_histo.c                    | 2 --
  drivers/media/platform/renesas/vsp1/vsp1_video.c                    | 2 --
  drivers/media/platform/rockchip/rga/rga-buf.c                       | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c             | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-params.c              | 2 --
  drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c               | 2 --
  drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c                 | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-capture.c            | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c          | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-lite.c               | 2 --
  drivers/media/platform/samsung/exynos4-is/fimc-m2m.c                | 2 --
  drivers/media/platform/samsung/s3c-camif/camif-capture.c            | 2 --
  drivers/media/platform/samsung/s5p-g2d/g2d.c                        | 2 --

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c

  drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c                | 2 --
  drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c                | 2 --
  drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c                    | 2 --
  drivers/media/platform/st/sti/delta/delta-v4l2.c                    | 4 ----
  drivers/media/platform/st/sti/hva/hva-v4l2.c                        | 2 --
  drivers/media/platform/st/stm32/dma2d/dma2d.c                       | 2 --
  drivers/media/platform/st/stm32/stm32-dcmi.c                        | 2 --
  drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c       | 6 ------
  drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c                  | 2 --
  drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c          | 2 --
  drivers/media/platform/sunxi/sun8i-di/sun8i-di.c                    | 2 --
  drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c            | 2 --
  drivers/media/platform/ti/am437x/am437x-vpfe.c                      | 2 --
  drivers/media/platform/ti/cal/cal-video.c                           | 2 --
  drivers/media/platform/ti/davinci/vpif_capture.c                    | 2 --
  drivers/media/platform/ti/davinci/vpif_display.c                    | 2 --
  drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c               | 2 --
  drivers/media/platform/ti/omap/omap_vout.c                          | 2 --
  drivers/media/platform/ti/vpe/vpe.c                                 | 2 --
  drivers/media/platform/verisilicon/hantro_v4l2.c                    | 2 --
  drivers/media/platform/via/via-camera.c                             | 2 --
  drivers/media/platform/xilinx/xilinx-dma.c                          | 2 --
  76 files changed, 162 deletions(-)

drivers/media/platform/allegro-dvt/allegro-core.c +0 -2

index 44e0d5512f94aee8d31b74c00790548872344f2a..e491399afcc984346eb4159111f35bab5340f2b5 100644
@@ -2897,8 +2897,6 @@ static const struct vb2_ops allegro_queue_ops = {
  	.buf_queue = allegro_buf_queue,
  	.start_streaming = allegro_start_streaming,
  	.stop_streaming = allegro_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int allegro_queue_init(void *priv,

drivers/media/platform/amlogic/meson-ge2d/ge2d.c +0 -2

index b05c944d5dc2e50e8646d62a84c2971cce2f7cb5..0c004bb8ba05059245e73a306ed2d20dc18c9197 100644
@@ -391,8 +391,6 @@ static const struct vb2_ops ge2d_qops = {
  	.buf_queue = ge2d_buf_queue,
  	.start_streaming = ge2d_start_streaming,
  	.stop_streaming = ge2d_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int

drivers/media/platform/amphion/vpu_v4l2.c +0 -2

index f0b1ec79d2961cf1a5785359923bb57f1eeb21d5..45707931bc4f1fd0bce4852f97721bb7af98f44d 100644
@@ -646,8 +646,6 @@ static const struct vb2_ops vpu_vb2_ops = {
  	.start_streaming    = vpu_vb2_start_streaming,
  	.stop_streaming     = vpu_vb2_stop_streaming,
  	.buf_queue          = vpu_vb2_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  };
 
  static int vpu_m2m_queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)

drivers/media/platform/aspeed/aspeed-video.c +0 -2

index fd540349811517661671ac3c5a512af2127e0d44..54cae0da9aca3fd74800b51f79136a261aec241a 100644
@@ -1891,8 +1891,6 @@ static void aspeed_video_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops aspeed_video_vb2_ops = {
  	.queue_setup = aspeed_video_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_prepare = aspeed_video_buf_prepare,
  	.start_streaming = aspeed_video_start_streaming,
  	.stop_streaming = aspeed_video_stop_streaming,

drivers/media/platform/atmel/atmel-isi.c +0 -2

index 049b7faf57900120dbea7ca213c29037e2c39360..0d1c3934752972190d8a1ded9a04b2be2b768c36 100644
@@ -526,8 +526,6 @@ static const struct vb2_ops isi_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,
  };
 
  static int isi_g_fmt_vid_cap(struct file *file, void *priv,

drivers/media/platform/broadcom/bcm2835-unicam.c +0 -2

index 6dcc6c13a7540edbd30d9244511f784527a78cf0..3aed0e493c81f1aef1ac78bd20e1fd6f69d4bd6c 100644
@@ -1801,8 +1801,6 @@ static void unicam_buffer_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops unicam_video_qops = {
  	.queue_setup		= unicam_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= unicam_buffer_prepare,
  	.start_streaming	= unicam_start_streaming,
  	.stop_streaming		= unicam_stop_streaming,

drivers/media/platform/chips-media/coda/coda-common.c +0 -2

index c3afd63edbb2a0781b9cdb5d11937d229914ae91..289a076c3bcc776faf923c24eaa0ebe3e891ee79 100644
@@ -2171,8 +2171,6 @@ static const struct vb2_ops coda_qops = {
  	.buf_queue		= coda_buf_queue,
  	.start_streaming	= coda_start_streaming,
  	.stop_streaming		= coda_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int coda_s_ctrl(struct v4l2_ctrl *ctrl)

drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c +0 -2

index 99e929aab8709f700e34cac625d5d70a382bd6dd..d3ff420c52ce1c30ef2b50993a295c53f72e1183 100644
@@ -1475,8 +1475,6 @@ static void wave5_vpu_dec_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops wave5_vpu_dec_vb2_ops = {
  	.queue_setup = wave5_vpu_dec_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = wave5_vpu_dec_buf_queue,
  	.start_streaming = wave5_vpu_dec_start_streaming,
  	.stop_streaming = wave5_vpu_dec_stop_streaming,

drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c +0 -2

index 4e1c8a4e72728b769dcd216c92803a61fd3f4515..1e5fc5f8b856c5329b2c6007649285a28749b6aa 100644
@@ -1471,8 +1471,6 @@ static void wave5_vpu_enc_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops wave5_vpu_enc_vb2_ops = {
  	.queue_setup = wave5_vpu_enc_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = wave5_vpu_enc_buf_queue,
  	.start_streaming = wave5_vpu_enc_start_streaming,
  	.stop_streaming = wave5_vpu_enc_stop_streaming,

drivers/media/platform/imagination/e5010-jpeg-enc.c +0 -2

index 25044f15672e9b95265c1c04c82f66c6622a7520..c194f830577f9a2ed313e76f536e5d078729a3a3 100644
@@ -1593,8 +1593,6 @@ static const struct vb2_ops e5010_video_ops = {
  	.buf_finish = e5010_buf_finish,
  	.buf_prepare = e5010_buf_prepare,
  	.buf_out_validate = e5010_buf_out_validate,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = e5010_start_streaming,
  	.stop_streaming = e5010_stop_streaming,
  };

drivers/media/platform/intel/pxa_camera.c +0 -2

index b8b1cf0665ab60786585d2dd7d0cb2caa4ba2a84..bef1e7137f23f02ef0005058c59fb712ba467cea 100644
@@ -1504,8 +1504,6 @@ static const struct vb2_ops pxac_vb2_ops = {
  	.buf_cleanup		= pxac_vb2_cleanup,
  	.start_streaming	= pxac_vb2_start_streaming,
  	.stop_streaming		= pxac_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int pxa_camera_init_videobuf2(struct pxa_camera_dev *pcdev)

drivers/media/platform/m2m-deinterlace.c +0 -2

index 7d331c37525a4aa98ec02d2d477ef7d622e87664..5188f31890966735c6eba990587627f43ff84378 100644
@@ -784,8 +784,6 @@ static const struct vb2_ops deinterlace_qops = {
  	.queue_setup	 = deinterlace_queue_setup,
  	.buf_prepare	 = deinterlace_buf_prepare,
  	.buf_queue	 = deinterlace_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/marvell/mcam-core.c +0 -4

index c81593c969e057f7efb24666f48f6ac9fdf06ed1..9ec01228f907311f1034523f06a2704a3b70b902 100644
@@ -1203,8 +1203,6 @@ static const struct vb2_ops mcam_vb2_ops = {
  	.buf_queue		= mcam_vb_buf_queue,
  	.start_streaming	= mcam_vb_start_streaming,
  	.stop_streaming		= mcam_vb_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
 

@@ -1267,8 +1265,6 @@ static const struct vb2_ops mcam_vb2_sg_ops = {
  	.buf_cleanup		= mcam_vb_sg_buf_cleanup,
  	.start_streaming	= mcam_vb_start_streaming,
  	.stop_streaming		= mcam_vb_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  #endif /* MCAM_MODE_DMA_SG */

drivers/media/platform/mediatek/jpeg/mtk_jpeg_core.c +0 -4

index a5bf75eb8b221245b53a2fc08d5514b6ba9d25f0..834d2a354692df120b81ee0bef7f816a4529a2f4 100644
@@ -884,8 +884,6 @@ static const struct vb2_ops mtk_jpeg_dec_qops = {
  	.queue_setup        = mtk_jpeg_queue_setup,
  	.buf_prepare        = mtk_jpeg_buf_prepare,
  	.buf_queue          = mtk_jpeg_dec_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  	.stop_streaming     = mtk_jpeg_dec_stop_streaming,
  };
 

@@ -893,8 +891,6 @@ static const struct vb2_ops mtk_jpeg_enc_qops = {
  	.queue_setup        = mtk_jpeg_queue_setup,
  	.buf_prepare        = mtk_jpeg_buf_prepare,
  	.buf_queue          = mtk_jpeg_enc_buf_queue,
-	.wait_prepare       = vb2_ops_wait_prepare,
-	.wait_finish        = vb2_ops_wait_finish,
  	.stop_streaming     = mtk_jpeg_enc_stop_streaming,
  };
 

drivers/media/platform/mediatek/mdp/mtk_mdp_m2m.c +0 -2

index f14779e7596e51057079472bf57588813ff3c39d..28c998bd3a81c440bc273ba0a09bf31e3460d8e1 100644
@@ -584,8 +584,6 @@ static const struct vb2_ops mtk_mdp_m2m_qops = {
  	.buf_queue	 = mtk_mdp_m2m_buf_queue,
  	.stop_streaming	 = mtk_mdp_m2m_stop_streaming,
  	.start_streaming = mtk_mdp_m2m_start_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int mtk_mdp_m2m_querycap(struct file *file, void *fh,

drivers/media/platform/mediatek/mdp3/mtk-mdp3-m2m.c +0 -2

index 0e69128a3772c38135ab8348063ae1306e7155c9..59ce5cce069836a6902df686f4dd91b13fa729f2 100644
@@ -266,8 +266,6 @@ static void mdp_m2m_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops mdp_m2m_qops = {
  	.queue_setup	= mdp_m2m_queue_setup,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  	.buf_prepare	= mdp_m2m_buf_prepare,
  	.start_streaming = mdp_m2m_start_streaming,
  	.stop_streaming	= mdp_m2m_stop_streaming,

drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateful.c +0 -2

index e62c1c18758bb18f518de88633995bcf4955781d..aa9bdee7a96ca97bd92846edd79643b428ff5948 100644
@@ -598,8 +598,6 @@ static void mtk_init_vdec_params(struct mtk_vcodec_dec_ctx *ctx)
  static const struct vb2_ops mtk_vdec_frame_vb2_ops = {
  	.queue_setup = vb2ops_vdec_queue_setup,
  	.buf_prepare = vb2ops_vdec_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = vb2ops_vdec_start_streaming,
 
  	.buf_queue = vb2ops_vdec_stateful_buf_queue,

drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_stateless.c +0 -2

index 3307dc15fc1dfee96362239f2096190c57a0be10..afa224da0f4165cf5701d6861f1f787c6317bfe4 100644
@@ -856,8 +856,6 @@ static int vb2ops_vdec_out_buf_validate(struct vb2_buffer *vb)
 
  static const struct vb2_ops mtk_vdec_request_vb2_ops = {
  	.queue_setup	= vb2ops_vdec_queue_setup,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  	.start_streaming	= vb2ops_vdec_start_streaming,
  	.stop_streaming	= vb2ops_vdec_stop_streaming,
 

drivers/media/platform/mediatek/vcodec/encoder/mtk_vcodec_enc.c +0 -2

index 7eaf0e24c9fc41bf8f431c885417ff348299c2eb..a01dc25a769911cd85a8d19c58e0c0a12b92ad50 100644
@@ -1009,8 +1009,6 @@ static const struct vb2_ops mtk_venc_vb2_ops = {
  	.buf_out_validate	= vb2ops_venc_buf_out_validate,
  	.buf_prepare		= vb2ops_venc_buf_prepare,
  	.buf_queue		= vb2ops_venc_buf_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= vb2ops_venc_start_streaming,
  	.stop_streaming		= vb2ops_venc_stop_streaming,
  };

drivers/media/platform/microchip/microchip-isc-base.c +0 -2

index 28e56f6a695da2a6e4035fbe99b80ff65e95517e..a7cdc743fda71db0ffbf499cb4b9ca18c9e7abf2 100644
@@ -465,8 +465,6 @@ static void isc_buffer_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops isc_vb2_ops = {
  	.queue_setup		= isc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= isc_buffer_prepare,
  	.start_streaming	= isc_start_streaming,
  	.stop_streaming		= isc_stop_streaming,

drivers/media/platform/nuvoton/npcm-video.c +0 -2

index 3b527029cbbbb22e77724df8557d4944924c3939..4f5d75645b2bb94669d976f9bfe7a9870f92c481 100644
@@ -1558,8 +1558,6 @@ static const struct regmap_config npcm_video_ece_regmap_cfg = {
 
  static const struct vb2_ops npcm_video_vb2_ops = {
  	.queue_setup = npcm_video_queue_setup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_prepare = npcm_video_buf_prepare,
  	.buf_finish = npcm_video_buf_finish,
  	.start_streaming = npcm_video_start_streaming,

drivers/media/platform/nvidia/tegra-vde/v4l2.c +0 -2

index ebf882198eeeb71e316a2d10985067fb897532e8..e3726cab0c82c92cf0d552b8e8061fd22badfa90 100644
@@ -328,8 +328,6 @@ static const struct vb2_ops tegra_qops = {
  	.buf_request_complete = tegra_buf_request_complete,
  	.start_streaming = tegra_start_streaming,
  	.stop_streaming = tegra_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int tegra_queue_init(void *priv,

drivers/media/platform/nxp/dw100/dw100.c +0 -2

index 54ebf59df682e067a5035c5ff399091642c77c97..66582e7f92fc6c0751afcc302dfe94f049a88b87 100644
@@ -558,8 +558,6 @@ static const struct vb2_ops dw100_qops = {
  	.buf_queue	 = dw100_buf_queue,
  	.start_streaming = dw100_start_streaming,
  	.stop_streaming  = dw100_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int dw100_m2m_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c +0 -2

index d8e946aebba276139245de1475b4c54a9fc381ac..7f5fe551179b9eb27a3e6846f57d083dd5323ffc 100644
@@ -1965,8 +1965,6 @@ static int mxc_jpeg_buf_prepare(struct vb2_buffer *vb)
 
  static const struct vb2_ops mxc_jpeg_qops = {
  	.queue_setup		= mxc_jpeg_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_out_validate	= mxc_jpeg_buf_out_validate,
  	.buf_prepare		= mxc_jpeg_buf_prepare,
  	.start_streaming	= mxc_jpeg_start_streaming,

drivers/media/platform/nxp/imx-pxp.c +0 -2

index e696d377960f9a2c554db2ad2956e8763fdfbead..7f8ffbac582fcf6a968e5ab000827d7086c18261 100644
@@ -1606,8 +1606,6 @@ static const struct vb2_ops pxp_qops = {
  	.buf_queue	 = pxp_buf_queue,
  	.start_streaming = pxp_start_streaming,
  	.stop_streaming  = pxp_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/nxp/imx7-media-csi.c +0 -2

index 08e36b7bab59ebd4b2b2ed77158055f86429adf1..34a92642bbfe7b7ce9c85fbaf346c6f595425cc9 100644
@@ -1507,8 +1507,6 @@ static const struct vb2_ops imx7_csi_video_qops = {
  	.buf_init        = imx7_csi_video_buf_init,
  	.buf_prepare	 = imx7_csi_video_buf_prepare,
  	.buf_queue	 = imx7_csi_video_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = imx7_csi_video_start_streaming,
  	.stop_streaming  = imx7_csi_video_stop_streaming,
  };

drivers/media/platform/nxp/imx8-isi/imx8-isi-m2m.c +0 -2

index 9745d6219a1667f28c2b290ded1c7739bee8c2ba..794050a6a919b8d108e4585d6be5ffd519e1311f 100644
@@ -269,8 +269,6 @@ static const struct vb2_ops mxc_isi_m2m_vb2_qops = {
  	.buf_init		= mxc_isi_m2m_vb2_buffer_init,
  	.buf_prepare		= mxc_isi_m2m_vb2_buffer_prepare,
  	.buf_queue		= mxc_isi_m2m_vb2_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= mxc_isi_m2m_vb2_start_streaming,
  	.stop_streaming		= mxc_isi_m2m_vb2_stop_streaming,
  };

drivers/media/platform/nxp/imx8-isi/imx8-isi-video.c +0 -2

index 4091f1c0e78bdca91e66d3d63e96da0e3d2ad5af..c0ba34ea82fd799a4efbd723f6cd459ca1572283 100644
@@ -987,8 +987,6 @@ static const struct vb2_ops mxc_isi_vb2_qops = {
  	.buf_init		= mxc_isi_vb2_buffer_init,
  	.buf_prepare		= mxc_isi_vb2_buffer_prepare,
  	.buf_queue		= mxc_isi_vb2_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= mxc_isi_vb2_start_streaming,
  	.stop_streaming		= mxc_isi_vb2_stop_streaming,
  };

drivers/media/platform/nxp/mx2_emmaprp.c +0 -2

index bcad0aed7206e28651b54caf8d456d748aeb9abc..0c6cc120fd2a443db4dbc583f2cdb1cfd61b6a7e 100644
@@ -677,8 +677,6 @@ static const struct vb2_ops emmaprp_qops = {
  	.queue_setup	 = emmaprp_queue_setup,
  	.buf_prepare	 = emmaprp_buf_prepare,
  	.buf_queue	 = emmaprp_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/qcom/camss/camss-video.c +0 -2

index 3b8fc31d957c77fcfd19790f066b4025b1a7ea51..aa021fd5e1233ba413acc9fdbac6b677619079b4 100644
@@ -310,8 +310,6 @@ static void video_stop_streaming(struct vb2_queue *q)
 
  static const struct vb2_ops msm_video_vb2_q_ops = {
  	.queue_setup     = video_queue_setup,
-	.wait_prepare    = vb2_ops_wait_prepare,
-	.wait_finish     = vb2_ops_wait_finish,
  	.buf_init        = video_buf_init,
  	.buf_prepare     = video_buf_prepare,
  	.buf_queue       = video_buf_queue,

drivers/media/platform/qcom/venus/vdec.c +0 -2

index 6252a6b3d4ba6d49b343bb53dfb7b0e683410bb4..fd4c4934c910383539c59948df9fdc39f62a2d1f 100644
@@ -1390,8 +1390,6 @@ static const struct vb2_ops vdec_vb2_ops = {
  	.buf_prepare = venus_helper_vb2_buf_prepare,
  	.start_streaming = vdec_start_streaming,
  	.stop_streaming = vdec_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = vdec_vb2_buf_queue,
  };
 

drivers/media/platform/qcom/venus/venc.c +0 -2

index 322a7737e2c7befdebcdf147955ba1d5ba8b42e2..b1093683c3063807e597a465fd1f80c2bf0d76f1 100644
@@ -1319,8 +1319,6 @@ static const struct vb2_ops venc_vb2_ops = {
  	.buf_prepare = venus_helper_vb2_buf_prepare,
  	.start_streaming = venc_start_streaming,
  	.stop_streaming = venus_helper_vb2_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = venc_vb2_buf_queue,
  };
 

drivers/media/platform/raspberrypi/pisp_be/pisp_be.c +0 -2

index 89e36e8219ed8b7cc4040ae1f33ec21bb12778d6..7596ae1f7de6671484d4d351015b234829f642d4 100644
@@ -964,8 +964,6 @@ static const struct vb2_ops pispbe_node_queue_ops = {
  	.buf_queue = pispbe_node_buffer_queue,
  	.start_streaming = pispbe_node_start_streaming,
  	.stop_streaming = pispbe_node_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static const struct v4l2_file_operations pispbe_fops = {

drivers/media/platform/renesas/rcar-vin/rcar-dma.c +0 -2

index 21d5b2815e86a66a1786901586f18f5474b94ad0..39cf22376fbe0a4c0ea761272d3c8c302a6e51c0 100644
@@ -1529,8 +1529,6 @@ static const struct vb2_ops rvin_qops = {
  	.buf_queue		= rvin_buffer_queue,
  	.start_streaming	= rvin_start_streaming_vq,
  	.stop_streaming		= rvin_stop_streaming_vq,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  void rvin_dma_unregister(struct rvin_dev *vin)

drivers/media/platform/renesas/rcar_drif.c +0 -2

index a7b882975440d0ae0e81fe1b20d1d02affcf97f1..fc8b6bbef793c64e63f8750eadbcf0cbe43f9c41 100644
@@ -861,8 +861,6 @@ static const struct vb2_ops rcar_drif_vb2_ops = {
  	.buf_queue              = rcar_drif_buf_queue,
  	.start_streaming        = rcar_drif_start_streaming,
  	.stop_streaming         = rcar_drif_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int rcar_drif_querycap(struct file *file, void *fh,

drivers/media/platform/renesas/rcar_fdp1.c +0 -2

index 5827cc33ab50fd05f1e7312ca3f6de070d15c76d..5d453a7a89889fa3fd115da5f87b4bb24554a3c6 100644
@@ -2032,8 +2032,6 @@ static const struct vb2_ops fdp1_qops = {
  	.buf_queue	 = fdp1_buf_queue,
  	.start_streaming = fdp1_start_streaming,
  	.stop_streaming  = fdp1_stop_streaming,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/renesas/rcar_jpu.c +0 -2

index 881df8a8a1ac8521d615512320d963debc6a040a..1421364d2d14d2dac3cd5afd63377d9005926044 100644
@@ -1171,8 +1171,6 @@ static const struct vb2_ops jpu_qops = {
  	.buf_finish		= jpu_buf_finish,
  	.start_streaming	= jpu_start_streaming,
  	.stop_streaming		= jpu_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int jpu_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/renesas/renesas-ceu.c +0 -2

index cacfa3951c4d52b34c7eb9d587540d744f519804..8cceafe491b1bec6c10ced8e0336b5575db88297 100644
@@ -761,8 +761,6 @@ static const struct vb2_ops ceu_vb2_ops = {
  	.queue_setup		= ceu_vb2_setup,
  	.buf_queue		= ceu_vb2_queue,
  	.buf_prepare		= ceu_vb2_prepare,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= ceu_start_streaming,
  	.stop_streaming		= ceu_stop_streaming,
  };

drivers/media/platform/renesas/rzg2l-cru/rzg2l-video.c +0 -2

index b16b8af6e8f8cb067fbdd71cf9b49cb4784eaaea..128694c0b144181cdfb26062cd2d92c831d884d1 100644
@@ -712,8 +712,6 @@ static const struct vb2_ops rzg2l_cru_qops = {
  	.buf_queue		= rzg2l_cru_buffer_queue,
  	.start_streaming	= rzg2l_cru_start_streaming_vq,
  	.stop_streaming		= rzg2l_cru_stop_streaming_vq,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  void rzg2l_cru_dma_unregister(struct rzg2l_cru_dev *cru)

drivers/media/platform/renesas/sh_vou.c +0 -2

index d440e54599195bf72bbeeeff221138a3d3902e05..4ad7ae188d5b25ab383d664898f855a4819c1a85 100644
@@ -360,8 +360,6 @@ static const struct vb2_ops sh_vou_qops = {
  	.buf_queue		= sh_vou_buf_queue,
  	.start_streaming	= sh_vou_start_streaming,
  	.stop_streaming		= sh_vou_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* Video IOCTLs */

drivers/media/platform/renesas/vsp1/vsp1_histo.c +0 -2

index 9c2d4c91bfadb8f19773fca511014c29f326c41d..c762202877babdc651a63997f4340f6a37a301ac 100644
@@ -155,8 +155,6 @@ static const struct vb2_ops histo_video_queue_qops = {
  	.queue_setup = histo_queue_setup,
  	.buf_prepare = histo_buffer_prepare,
  	.buf_queue = histo_buffer_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = histo_start_streaming,
  	.stop_streaming = histo_stop_streaming,
  };

drivers/media/platform/renesas/vsp1/vsp1_video.c +0 -2

index e728f9f5160e42f2cf8956cd4180c0ce2162073b..03f4efd6b82bd76419ff048f24c82ecce44f321c 100644
@@ -873,8 +873,6 @@ static const struct vb2_ops vsp1_video_queue_qops = {
  	.queue_setup = vsp1_video_queue_setup,
  	.buf_prepare = vsp1_video_buffer_prepare,
  	.buf_queue = vsp1_video_buffer_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = vsp1_video_start_streaming,
  	.stop_streaming = vsp1_video_stop_streaming,
  };

drivers/media/platform/rockchip/rga/rga-buf.c +0 -2

index 70808049d2e810dadc76d2adfa366ec4f4d046a9..8a48e9d91f96f1afbcc5367e6bd00898729a3be2 100644
@@ -218,8 +218,6 @@ const struct vb2_ops rga_qops = {
  	.buf_prepare = rga_buf_prepare,
  	.buf_queue = rga_buf_queue,
  	.buf_cleanup = rga_buf_cleanup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = rga_buf_start_streaming,
  	.stop_streaming = rga_buf_stop_streaming,
  };

drivers/media/platform/rockchip/rkisp1/rkisp1-capture.c +0 -2

index 2bddb4fa8a5cd163f383a9baa9fc3e2ca1ea87b8..02339cd94486ab2b669c966895c83d7dcc2d2b94 100644
@@ -1203,8 +1203,6 @@ static const struct vb2_ops rkisp1_vb2_ops = {
  	.buf_init = rkisp1_vb2_buf_init,
  	.buf_queue = rkisp1_vb2_buf_queue,
  	.buf_prepare = rkisp1_vb2_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = rkisp1_vb2_stop_streaming,
  	.start_streaming = rkisp1_vb2_start_streaming,
  };

drivers/media/platform/rockchip/rkisp1/rkisp1-params.c +0 -2

index 320581a9f866e919c1bf0cf64d34d20ea08c02d3..b28f4140c8a309a3231d44d825c6461e3ecb2a44 100644
@@ -2704,8 +2704,6 @@ static const struct vb2_ops rkisp1_params_vb2_ops = {
  	.queue_setup = rkisp1_params_vb2_queue_setup,
  	.buf_init = rkisp1_params_vb2_buf_init,
  	.buf_cleanup = rkisp1_params_vb2_buf_cleanup,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.buf_queue = rkisp1_params_vb2_buf_queue,
  	.buf_prepare = rkisp1_params_vb2_buf_prepare,
  	.stop_streaming = rkisp1_params_vb2_stop_streaming,

drivers/media/platform/rockchip/rkisp1/rkisp1-stats.c +0 -2

index a502719e916a92bcf4cbc53bc0895e591e23a894..d5fdb8f82dc78b0143f71d76f36817db389921b7 100644
@@ -150,8 +150,6 @@ static const struct vb2_ops rkisp1_stats_vb2_ops = {
  	.queue_setup = rkisp1_stats_vb2_queue_setup,
  	.buf_queue = rkisp1_stats_vb2_buf_queue,
  	.buf_prepare = rkisp1_stats_vb2_buf_prepare,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = rkisp1_stats_vb2_stop_streaming,
  };
 

drivers/media/platform/samsung/exynos-gsc/gsc-m2m.c +0 -2

index b7854ce5fb8e34f51b70f7392caf2ccb1cf0d7ba..4bda1c369c44c41265a42f2bab6f70ec532881bd 100644
@@ -276,8 +276,6 @@ static const struct vb2_ops gsc_m2m_qops = {
  	.queue_setup	 = gsc_m2m_queue_setup,
  	.buf_prepare	 = gsc_m2m_buf_prepare,
  	.buf_queue	 = gsc_m2m_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.stop_streaming	 = gsc_m2m_stop_streaming,
  	.start_streaming = gsc_m2m_start_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-capture.c +0 -2

index ffa4ea21387da39136d9dcfdb02a6a7cfe6edebc..c3c2e474a18a725fd196ae29d107bc056d4a0932 100644
@@ -455,8 +455,6 @@ static const struct vb2_ops fimc_capture_qops = {
  	.queue_setup		= queue_setup,
  	.buf_prepare		= buffer_prepare,
  	.buf_queue		= buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= start_streaming,
  	.stop_streaming		= stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-isp-video.c +0 -2

index 06c4352562b38fb7cce395b31698f3798b06bc77..ad219ac1b95137a703ea709d12139cca6b2e2332 100644
@@ -255,8 +255,6 @@ static const struct vb2_ops isp_video_capture_qops = {
  	.queue_setup	 = isp_video_capture_queue_setup,
  	.buf_prepare	 = isp_video_capture_buffer_prepare,
  	.buf_queue	 = isp_video_capture_buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = isp_video_capture_start_streaming,
  	.stop_streaming	 = isp_video_capture_stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-lite.c +0 -2

index e362719612d2f88c32f284ba97d614eed74009ab..f23e51e3da2fe520683a556b2e912e1e3cedff95 100644
@@ -441,8 +441,6 @@ static const struct vb2_ops fimc_lite_qops = {
  	.queue_setup	 = queue_setup,
  	.buf_prepare	 = buffer_prepare,
  	.buf_queue	 = buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = start_streaming,
  	.stop_streaming	 = stop_streaming,
  };

drivers/media/platform/samsung/exynos4-is/fimc-m2m.c +0 -2

index 199997eec1cc25bbc3872c960e323128fac430d2..951433c8e92a5b75bad59f2e0dbf7d56f6726dee 100644
@@ -216,8 +216,6 @@ static const struct vb2_ops fimc_qops = {
  	.queue_setup	 = fimc_queue_setup,
  	.buf_prepare	 = fimc_buf_prepare,
  	.buf_queue	 = fimc_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.stop_streaming	 = stop_streaming,
  	.start_streaming = start_streaming,
  };

drivers/media/platform/samsung/s3c-camif/camif-capture.c +0 -2

index be58260ea67e797f44326c7d8140aeb66da1d8b9..bd1149e8abc2d2fb923f5a11368c388f6a23dbd6 100644
@@ -525,8 +525,6 @@ static const struct vb2_ops s3c_camif_qops = {
  	.queue_setup	 = queue_setup,
  	.buf_prepare	 = buffer_prepare,
  	.buf_queue	 = buffer_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = start_streaming,
  	.stop_streaming	 = stop_streaming,
  };

drivers/media/platform/samsung/s5p-g2d/g2d.c +0 -2

index e5e55a41bf3e853d82001074ba285224988c4735..ffed16a34493be2edbdaee13619467417487c1e7 100644
@@ -133,8 +133,6 @@ static const struct vb2_ops g2d_qops = {
  	.queue_setup	= g2d_queue_setup,
  	.buf_prepare	= g2d_buf_prepare,
  	.buf_queue	= g2d_buf_queue,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c +0 -2

index 30a6144f2c770db9197e053871971eed2d1eb331..71d7a1d853a87e2eff27102927a42bdae757619c 100644
@@ -2590,8 +2590,6 @@ static const struct vb2_ops s5p_jpeg_qops = {
  	.queue_setup		= s5p_jpeg_queue_setup,
  	.buf_prepare		= s5p_jpeg_buf_prepare,
  	.buf_queue		= s5p_jpeg_buf_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.start_streaming	= s5p_jpeg_start_streaming,
  	.stop_streaming		= s5p_jpeg_stop_streaming,
  };

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_dec.c +0 -2

index 91e102d4ec4e2ad9f432c662561e565de6cdc39e..3efbc336790629425c2a71e9feee8f073db55790 100644
@@ -1161,8 +1161,6 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops s5p_mfc_dec_qops = {
  	.queue_setup		= s5p_mfc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_init		= s5p_mfc_buf_init,
  	.start_streaming	= s5p_mfc_start_streaming,
  	.stop_streaming		= s5p_mfc_stop_streaming,

drivers/media/platform/samsung/s5p-mfc/s5p_mfc_enc.c +0 -2

index 81cbb36fb382c0a0644730e7eb87b61884a8ed03..6c603dcd56649fcabe161173c64b9ea8bd055b93 100644
@@ -2652,8 +2652,6 @@ static void s5p_mfc_buf_queue(struct vb2_buffer *vb)
 
  static const struct vb2_ops s5p_mfc_enc_qops = {
  	.queue_setup		= s5p_mfc_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_init		= s5p_mfc_buf_init,
  	.buf_prepare		= s5p_mfc_buf_prepare,
  	.start_streaming	= s5p_mfc_start_streaming,

drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c +0 -2

index 3b0066cf2eb0899e74a227554129839656bac6f1..73ad66ed20f2e3201e8ceb1d2ff9aff1ad873c92 100644
@@ -531,8 +531,6 @@ static const struct vb2_ops bdisp_qops = {
  	.queue_setup     = bdisp_queue_setup,
  	.buf_prepare     = bdisp_buf_prepare,
  	.buf_queue       = bdisp_buf_queue,
-	.wait_prepare    = vb2_ops_wait_prepare,
-	.wait_finish     = vb2_ops_wait_finish,
  	.stop_streaming  = bdisp_stop_streaming,
  	.start_streaming = bdisp_start_streaming,
  };

drivers/media/platform/st/sti/delta/delta-v4l2.c +0 -4

index fdee7fae3a20133b002932c80372ab92c83c7ae5..196e6a40335d14898ff7abbb38d2de2f5bcf6789 100644
@@ -1559,8 +1559,6 @@ static const struct vb2_ops delta_vb2_au_ops = {
  	.queue_setup = delta_vb2_au_queue_setup,
  	.buf_prepare = delta_vb2_au_prepare,
  	.buf_queue = delta_vb2_au_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = delta_vb2_au_start_streaming,
  	.stop_streaming = delta_vb2_au_stop_streaming,
  };

@@ -1570,8 +1568,6 @@ static const struct vb2_ops delta_vb2_frame_ops = {
  	.buf_prepare = delta_vb2_frame_prepare,
  	.buf_finish = delta_vb2_frame_finish,
  	.buf_queue = delta_vb2_frame_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.stop_streaming = delta_vb2_frame_stop_streaming,
  };
 

drivers/media/platform/st/sti/hva/hva-v4l2.c +0 -2

index 31a94300d6457b8da689e26004d906c11588d8c0..5366c0f92549bb090967a1337ce55d0b0f1d76ce 100644
@@ -1114,8 +1114,6 @@ static const struct vb2_ops hva_qops = {
  	.buf_queue		= hva_buf_queue,
  	.start_streaming	= hva_start_streaming,
  	.stop_streaming		= hva_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /*

drivers/media/platform/st/stm32/dma2d/dma2d.c +0 -2

index 643bda7f9f7d10a4a6b282babfb1504f85c3af5c..b6c8400fb92da974d95bd74770bd8196b5be0dc0 100644
@@ -186,8 +186,6 @@ static const struct vb2_ops dma2d_qops = {
  	.buf_queue	= dma2d_buf_queue,
  	.start_streaming = dma2d_start_streaming,
  	.stop_streaming  = dma2d_stop_streaming,
-	.wait_prepare	= vb2_ops_wait_prepare,
-	.wait_finish	= vb2_ops_wait_finish,
  };
 
  static int queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/st/stm32/stm32-dcmi.c +0 -2

index a28db89e4b50f739fb5f5f821ac4176bd856b4f5..9b699ee2b1e0614c22f68da2709b54c85e5024bd 100644
@@ -898,8 +898,6 @@ static const struct vb2_ops dcmi_video_qops = {
  	.buf_queue		= dcmi_buf_queue,
  	.start_streaming	= dcmi_start_streaming,
  	.stop_streaming		= dcmi_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int dcmi_g_fmt_vid_cap(struct file *file, void *priv,

drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-bytecap.c +0 -6

index 9f768f011fa25a0981cd0d1d3f114b02e58223d4..7edd49bfe7e5b8d6962777291f82e21131f1fae2 100644
@@ -625,12 +625,6 @@ static const struct vb2_ops dcmipp_bytecap_qops = {
  	.buf_prepare		= dcmipp_bytecap_buf_prepare,
  	.buf_queue		= dcmipp_bytecap_buf_queue,
  	.queue_setup		= dcmipp_bytecap_queue_setup,
-	/*
-	 * Since q->lock is set we can use the standard
-	 * vb2_ops_wait_prepare/finish helper functions.
-	 */
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static void dcmipp_bytecap_release(struct video_device *vdev)

drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c +0 -2

index d1371e13011374ef78874f723a424ed8bb42ed79..e911c7f7acc5245b92ce20a9c2f8a16516eeb901 100644
@@ -371,8 +371,6 @@ static const struct vb2_ops sun4i_csi_qops = {
  	.buf_queue		= sun4i_csi_buffer_queue,
  	.start_streaming	= sun4i_csi_start_streaming,
  	.stop_streaming		= sun4i_csi_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static irqreturn_t sun4i_csi_irq(int irq, void *data)

drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c +0 -2

index 14c0dc827c5200d854022680e3867a2604e863ad..76356bc7f10e396253b24a3a73d942d6a045942f 100644
@@ -657,8 +657,6 @@ static const struct vb2_ops sun6i_csi_capture_queue_ops = {
  	.buf_queue		= sun6i_csi_capture_buffer_queue,
  	.start_streaming	= sun6i_csi_capture_start_streaming,
  	.stop_streaming		= sun6i_csi_capture_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* V4L2 Device */

drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +0 -2

index c55b1761b089778b3ace385da331fa81585ec3d6..3e7f2df70408b882f6c9d47b66a8e092f6960927 100644
@@ -659,8 +659,6 @@ static const struct vb2_ops deinterlace_qops = {
  	.buf_queue		= deinterlace_buf_queue,
  	.start_streaming	= deinterlace_start_streaming,
  	.stop_streaming		= deinterlace_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int deinterlace_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/sunxi/sun8i-rotate/sun8i_rotate.c +0 -2

index d60d3496e5b4d6821e1dce42d7f79560a8485179..abd10b218aa1dc552004fe7ebcb815b3d6b8a43d 100644
@@ -522,8 +522,6 @@ static const struct vb2_ops rotate_qops = {
  	.buf_queue		= rotate_buf_queue,
  	.start_streaming	= rotate_start_streaming,
  	.stop_streaming		= rotate_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  static int rotate_queue_init(void *priv, struct vb2_queue *src_vq,

drivers/media/platform/ti/am437x/am437x-vpfe.c +0 -2

index edbe0620ecaadf0b53852a6ebc5e983a33a171b9..44cdccb8937752964a0787d192d9b7fc0f5efbf9 100644
@@ -2079,8 +2079,6 @@ static long vpfe_ioctl_default(struct file *file, void *priv,
  }
 
  static const struct vb2_ops vpfe_video_qops = {
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.queue_setup		= vpfe_queue_setup,
  	.buf_prepare		= vpfe_buffer_prepare,
  	.buf_queue		= vpfe_buffer_queue,

drivers/media/platform/ti/cal/cal-video.c +0 -2

index e1ba5dfc217e3ac9421cb749cce78c87c9e75a6c..e29743ae61e27ea6d11d3555aaf370d747fbbad9 100644
@@ -808,8 +808,6 @@ static const struct vb2_ops cal_video_qops = {
  	.buf_queue		= cal_buffer_queue,
  	.start_streaming	= cal_start_streaming,
  	.stop_streaming		= cal_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* ------------------------------------------------------------------

drivers/media/platform/ti/davinci/vpif_capture.c +0 -2

index 8357450b3f01a7da387b8fcb46fe6de765f56568..d053972888d1b43161e99a04c4ca5e11664bf5b8 100644
@@ -310,8 +310,6 @@ static const struct vb2_ops video_qops = {
  	.start_streaming	= vpif_start_streaming,
  	.stop_streaming		= vpif_stop_streaming,
  	.buf_queue		= vpif_buffer_queue,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /**

drivers/media/platform/ti/davinci/vpif_display.c +0 -2

index bea47e5159de06a9ee537524dee97c7d136e564d..70c89549f4b61d79bb72157e722e1984a4fca68e 100644
@@ -293,8 +293,6 @@ static void vpif_stop_streaming(struct vb2_queue *vq)
 
  static const struct vb2_ops video_qops = {
  	.queue_setup		= vpif_buffer_queue_setup,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  	.buf_prepare		= vpif_buffer_prepare,
  	.start_streaming	= vpif_start_streaming,
  	.stop_streaming		= vpif_stop_streaming,

drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c +0 -2

index bd9c9e6ac573af2a564ef1c18feedec0544b64ec..9a4a72331b4f2d578d03b74f16f4c6625608510d 100644
@@ -878,8 +878,6 @@ static const struct vb2_ops csi_vb2_qops = {
  	.buf_queue = ti_csi2rx_buffer_queue,
  	.start_streaming = ti_csi2rx_start_streaming,
  	.stop_streaming = ti_csi2rx_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };
 
  static int ti_csi2rx_init_vb2q(struct ti_csi2rx_dev *csi)

drivers/media/platform/ti/omap/omap_vout.c +0 -2

index 85dca219042895b686a8c3b9f770f84186dbe478..a87d5030ac35ced841efa1d4e940b26594a8a275 100644
@@ -1300,8 +1300,6 @@ static const struct vb2_ops omap_vout_vb2_ops = {
  	.buf_prepare		= omap_vout_vb2_prepare,
  	.start_streaming	= omap_vout_vb2_start_streaming,
  	.stop_streaming		= omap_vout_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* Init functions used during driver initialization */

drivers/media/platform/ti/vpe/vpe.c +0 -2

index bd2e97afd776121e5d0813fc722b136eb902f5ec..636d76ecebcd7e6f4e98d6fe4873bf98b0f0239e 100644
@@ -2210,8 +2210,6 @@ static const struct vb2_ops vpe_qops = {
  	.queue_setup	 = vpe_queue_setup,
  	.buf_prepare	 = vpe_buf_prepare,
  	.buf_queue	 = vpe_buf_queue,
-	.wait_prepare	 = vb2_ops_wait_prepare,
-	.wait_finish	 = vb2_ops_wait_finish,
  	.start_streaming = vpe_start_streaming,
  	.stop_streaming  = vpe_stop_streaming,
  };

drivers/media/platform/verisilicon/hantro_v4l2.c +0 -2

index 32f69c6c703bf4af680c92557f0a5f6d9f4c715f..2513adfbd82595632d5e797a71501153d557c5d1 100644
@@ -1004,6 +1004,4 @@ const struct vb2_ops hantro_queue_ops = {
  	.buf_request_complete = hantro_buf_request_complete,
  	.start_streaming = hantro_start_streaming,
  	.stop_streaming = hantro_stop_streaming,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  };

drivers/media/platform/via/via-camera.c +0 -2

index 195e9bf1eedf69c0d27b3a0471a8354599e07853..5702eff664d4ef652b22aaeaaacbbd0e16a2e137 100644
@@ -666,8 +666,6 @@ static const struct vb2_ops viacam_vb2_ops = {
  	.buf_prepare		= viacam_vb2_prepare,
  	.start_streaming	= viacam_vb2_start_streaming,
  	.stop_streaming		= viacam_vb2_stop_streaming,
-	.wait_prepare		= vb2_ops_wait_prepare,
-	.wait_finish		= vb2_ops_wait_finish,
  };
 
  /* --------------------------------------------------------------------------*/

drivers/media/platform/xilinx/xilinx-dma.c +0 -2

index a1687b868a445228e33373fa7b268dd44ecebab7..18bfa6001909dfa6efc23b3ca432a39a1b316afc 100644
@@ -458,8 +458,6 @@ static const struct vb2_ops xvip_dma_queue_qops = {
  	.queue_setup = xvip_dma_queue_setup,
  	.buf_prepare = xvip_dma_buffer_prepare,
  	.buf_queue = xvip_dma_buffer_queue,
-	.wait_prepare = vb2_ops_wait_prepare,
-	.wait_finish = vb2_ops_wait_finish,
  	.start_streaming = xvip_dma_start_streaming,
  	.stop_streaming = xvip_dma_stop_streaming,
  };

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 <[email protected]>

---

  drivers/media/platform/samsung/s5p-jpeg/jpeg-core.c                 | 2 --

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 <[email protected]>

---
  drivers/staging/media/atomisp/pci/atomisp_fops.c          | 2 --
  drivers/staging/media/deprecated/atmel/atmel-isc-base.c   | 2 --
  drivers/staging/media/imx/imx-media-capture.c             | 2 --
  drivers/staging/media/imx/imx-media-csc-scaler.c          | 2 --
  drivers/staging/media/ipu3/ipu3-v4l2.c                    | 2 --
  drivers/staging/media/meson/vdec/vdec.c                   | 2 --
  drivers/staging/media/rkvdec/rkvdec.c                     | 2 --
  drivers/staging/media/starfive/camss/stf-video.c          | 2 --
  drivers/staging/media/sunxi/cedrus/cedrus_video.c         | 2 --
  drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c | 2 --
  drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c  | 2 --
  drivers/staging/media/tegra-video/vi.c                    | 2 --
  12 files changed, 24 deletions(-)

drivers/staging/media/atomisp/pci/atomisp_fops.c +0 -2

index b180fcbea9b1e6909cf3b6c2cf165684c6cf8667..50c4123ba006648db38c1e310bed4697d49615e0 100644
@@ -441,8 +441,6 @@ const struct vb2_ops atomisp_vb2_ops = {
  	.buf_queue		= atomisp_buf_queue,
  	.start_streaming	= atomisp_start_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)

drivers/staging/media/deprecated/atmel/atmel-isc-base.c +0 -2

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

drivers/staging/media/imx/imx-media-capture.c +0 -2

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

drivers/staging/media/imx/imx-media-csc-scaler.c +0 -2

index 95cca281e8a378c6244bd25d5b81c392712361aa..e5e08c6f79f222a86fbe528d84d5e9644fbbb63a 100644
@@ -572,8 +572,6 @@ static const struct vb2_ops ipu_csc_scaler_qops = {
  	.queue_setup		= ipu_csc_scaler_queue_setup,
  	.buf_prepare		= ipu_csc_scaler_buf_prepare,
  	.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,
  	.stop_streaming		= ipu_csc_scaler_stop_streaming,
  };

drivers/staging/media/ipu3/ipu3-v4l2.c +0 -2

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

drivers/staging/media/meson/vdec/vdec.c +0 -2

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

drivers/staging/media/rkvdec/rkvdec.c +0 -2

index ac398b5a97360446672a8a5c40ea05bcf222f557..f468af64bbef1c7e9019352508f95f5e2d2a083a 100644
@@ -617,8 +617,6 @@ static const struct vb2_ops rkvdec_queue_ops = {
  	.buf_request_complete = rkvdec_buf_request_complete,
  	.start_streaming = rkvdec_start_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)

drivers/staging/media/starfive/camss/stf-video.c +0 -2

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

drivers/staging/media/sunxi/cedrus/cedrus_video.c +0 -2

index b00feaf4072c995b4e54ffa6c67bffe039be1f49..77f78266f406288cfd5aa666dd5e3409b5a770cf 100644
@@ -570,8 +570,6 @@ static const struct vb2_ops cedrus_qops = {
  	.buf_request_complete	= cedrus_buf_request_complete,
  	.start_streaming	= cedrus_start_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,

drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c +0 -2

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

drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c +0 -2

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

drivers/staging/media/tegra-video/vi.c +0 -0

index 57a856a21e9013e5b179e45e42a4512ff466de0a..ad481b35e618a0b0e85af7276d84342440b82e64 100644

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 <[email protected]>