Commit f068a6ce authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

media: avoid use of 'videobuf' 



The term 'videobuf' typically refers to the old videobuf version 1
framework. Avoid using this word in drivers that are converted to
vb2.

Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 77423a62

Documentation/driver-api/media/drivers/pxa_camera.rst

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Global video workflow 


a) QCI stopped

   Initially, the QCI interface is stopped.

   When a buffer is queued (pxa_videobuf_ops->buf_queue), the QCI starts.

   When a buffer is queued, start_streaming is called and the QCI starts.



b) QCI started

   More buffers can be queued while the QCI is started without halting the

drivers/media/dvb-frontends/rtl2832_sdr.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static void rtl2832_sdr_urb_complete(struct urb *urb) 
		if (unlikely(fbuf == NULL)) {

			dev->vb_full++;

			dev_notice_ratelimited(&pdev->dev,

					       "videobuf is full, %d packets dropped\n",

					       "video buffer is full, %d packets dropped\n",

					       dev->vb_full);

			goto skip;

		}

drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c

+1 −1
Original line number Diff line number Diff line
@@ -1020,7 +1020,7 @@ static int solo_g_parm(struct file *file, void *priv, 
	cp->timeperframe.numerator = solo_enc->interval;

	cp->timeperframe.denominator = solo_enc->solo_dev->fps;

	cp->capturemode = 0;

	/* XXX: Shouldn't we be able to get/set this from videobuf? */

	/* XXX: Shouldn't we be able to get/set this from vb2? */

	cp->readbuffers = 2;



	return 0;

drivers/media/platform/intel/pxa_camera.c

+4 −4
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ static int pxa_init_dma_channel(struct pxa_camera_dev *pcdev, 
	return -ENOMEM;

}



static void pxa_videobuf_set_actdma(struct pxa_camera_dev *pcdev,

static void pxa_video_buf_set_actdma(struct pxa_camera_dev *pcdev,

				    struct pxa_buffer *buf)

{

	buf->active_dma = DMA_Y;
@@ -1163,7 +1163,7 @@ static void pxa_camera_eof(struct tasklet_struct *t) 
	pcdev->active = list_first_entry(&pcdev->capture,

					 struct pxa_buffer, queue);

	buf = pcdev->active;

	pxa_videobuf_set_actdma(pcdev, buf);

	pxa_video_buf_set_actdma(pcdev, buf);



	pxa_dma_start_channels(pcdev);

}
@@ -1416,7 +1416,7 @@ static int pxac_vb2_prepare(struct vb2_buffer *vb) 
	 * the actual buffer is yours

	 */

	buf->inwork = 0;

	pxa_videobuf_set_actdma(pcdev, buf);

	pxa_video_buf_set_actdma(pcdev, buf);



	return ret;

}

drivers/media/platform/marvell/mcam-core.h

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 


#if !defined(MCAM_MODE_VMALLOC) && !defined(MCAM_MODE_DMA_CONTIG) && \

	!defined(MCAM_MODE_DMA_SG)

#error One of the videobuf buffer modes must be selected in the config

#error One of the vb2 buffer modes must be selected in the config

#endif