Commit 58415c7e authored by Benjamin Gaignard's avatar Benjamin Gaignard Committed by Mauro Carvalho Chehab
Browse files

media: pci: netup_unidvb: Stop direct calls to queue num_buffers field 



Use vb2_get_num_buffers() to avoid using queue num_buffers field directly.
This allows us to change how the number of buffers is computed in the
future.

Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@collabora.com>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@collabora.com>
CC: Sergey Kozlov <serjk@netup.ru>
CC: Abylay Ospan <aospan@netup.ru>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent ad3d85a1

drivers/media/pci/netup_unidvb/netup_unidvb_core.c

+3 −2
Original line number Diff line number Diff line
@@ -293,12 +293,13 @@ static int netup_unidvb_queue_setup(struct vb2_queue *vq, 
				    struct device *alloc_devs[])

{

	struct netup_dma *dma = vb2_get_drv_priv(vq);

	unsigned int q_num_bufs = vb2_get_num_buffers(vq);



	dev_dbg(&dma->ndev->pci_dev->dev, "%s()\n", __func__);



	*nplanes = 1;

	if (vq->num_buffers + *nbuffers < VIDEO_MAX_FRAME)

		*nbuffers = VIDEO_MAX_FRAME - vq->num_buffers;

	if (q_num_bufs + *nbuffers < VIDEO_MAX_FRAME)

		*nbuffers = VIDEO_MAX_FRAME - q_num_bufs;

	sizes[0] = PAGE_ALIGN(NETUP_DMA_PACKETS_COUNT * 188);

	dev_dbg(&dma->ndev->pci_dev->dev, "%s() nbuffers=%d sizes[0]=%d\n",

		__func__, *nbuffers, sizes[0]);