[PATCH v11 35/56] media: usb: hackrf: Set min_buffers_needed to 8

Benjamin Gaignard
2023-10-12T11:47:09Z

vb2 queue_setup checks for a minimum number of buffers so set
min_buffers_needed to 8 and remove the useless check in
hackrf_queue_setup().

Signed-off-by: Benjamin Gaignard <benjamin.gaignard@collabora.com>
CC: Antti Palosaari <crope@iki.fi>
---
drivers/media/usb/hackrf/hackrf.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c
index 3e535be2c520..2e856b20aa21 100644
--- a/drivers/media/usb/hackrf/hackrf.c
+++ b/drivers/media/usb/hackrf/hackrf.c
@@ -754,15 +754,10 @@ static int hackrf_queue_setup(struct vb2_queue *vq,
{
struct hackrf_dev *dev = vb2_get_drv_priv(vq);

- dev_dbg(dev->dev, "nbuffers=%d\n", *nbuffers);
-
- /* Need at least 8 buffers */
- if (vq->num_buffers + *nbuffers < 8)
- *nbuffers = 8 - vq->num_buffers;
*nplanes = 1;
sizes[0] = PAGE_ALIGN(dev->buffersize);

- dev_dbg(dev->dev, "nbuffers=%d sizes[0]=%d\n", *nbuffers, sizes[0]);
+ dev_dbg(dev->dev, "nbuffers=%u sizes[0]=%d\n", vb2_get_num_buffers(vq), sizes[0]);
return 0;
}

@@ -1392,6 +1387,8 @@ static int hackrf_probe(struct usb_interface *intf,
dev->rx_vb2_queue.type = V4L2_BUF_TYPE_SDR_CAPTURE;
dev->rx_vb2_queue.io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF |
VB2_READ;
+ /* Need at least 8 buffers */
+ dev->rx_vb2_queue.min_buffers_needed = 8;
dev->rx_vb2_queue.ops = &hackrf_vb2_ops;
dev->rx_vb2_queue.mem_ops = &vb2_vmalloc_memops;
dev->rx_vb2_queue.drv_priv = dev;
--
2.39.2