Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1accaa2 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (6252): Adapt drivers to use the newer videobuf modules 



PCI-dependent videobuf_foo methods were renamed as videobuf_pci_foo.

Also, videobuf_dmabuf is now part of videobuf-dma-sg private struct.
So, to access it, a subroutine call is needed.

This patch renames all occurences of those function calls to be
consistent with the video-buf split.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981


Reviewed-by: default avatarRicardo Cerqueira <v4l@cerqueira.org>
parent 7a7d9a89

Documentation/dvb/faq.txt

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ Some very frequently asked questions about linuxtv-dvb 
	- saa7146_vv: SAA7146 video and vbi functions. These are only needed

	  for full-featured cards.



	- video-buf: capture helper module for the saa7146_vv driver. This

	- videobuf-dma-sg: capture helper module for the saa7146_vv driver. This

	  one is responsible to handle capture buffers.



	- dvb-ttpci: The main driver for AV7110 based, full-featured

drivers/media/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -126,8 +126,12 @@ config TUNER_SIMPLE 


endif # VIDEO_TUNER_CUSTOMIZE



config VIDEO_BUF

config VIDEOBUF_GEN

	tristate



config VIDEOBUF_DMA_SG

	depends on PCI

	select VIDEOBUF_GEN

	tristate



config VIDEO_BUF_DVB

drivers/media/common/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,5 +5,5 @@ config VIDEO_SAA7146 
config VIDEO_SAA7146_VV

	tristate

	depends on VIDEO_DEV

	select VIDEO_BUF

	select VIDEOBUF_DMA_SG

	select VIDEO_SAA7146

drivers/media/common/saa7146_core.c

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ int saa7146_wait_for_debi_done(struct saa7146_dev *dev, int nobusyloop) 
 * general helper functions

 ****************************************************************************/



/* this is videobuf_vmalloc_to_sg() from video-buf.c

/* this is videobuf_vmalloc_to_sg() from videobuf-dma-sg.c

   make sure virt has been allocated with vmalloc_32(), otherwise the BUG()

   may be triggered on highmem machines */

static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)

drivers/media/common/saa7146_fops.c

+3 −2
Original line number Diff line number Diff line
@@ -53,13 +53,14 @@ void saa7146_res_free(struct saa7146_fh *fh, unsigned int bits) 
void saa7146_dma_free(struct saa7146_dev *dev,struct videobuf_queue *q,

						struct saa7146_buf *buf)

{

	struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);

	DEB_EE(("dev:%p, buf:%p\n",dev,buf));



	BUG_ON(in_interrupt());



	videobuf_waiton(&buf->vb,0,0);

	videobuf_dma_unmap(q, &buf->vb.dma);

	videobuf_dma_free(&buf->vb.dma);

	videobuf_dma_unmap(q, dma);

	videobuf_dma_free(dma);

	buf->vb.state = STATE_NEEDS_INIT;

}