aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-vbi.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-23 15:37:49 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-10-09 21:14:55 -0400
commitc1accaa21bdef38ec0f36eaaf7ce3384fff9d0c5 (patch)
tree3a2c8206555af6c9e2eecdb20b052be70e6b93dd /drivers/media/video/saa7134/saa7134-vbi.c
parent7a7d9a89d0307b1743d782197e2c5fc5ddf183f3 (diff)
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: Mauro Carvalho Chehab <mchehab@infradead.org> http://thread.gmane.org/gmane.comp.video.video4linux/34978/focus=34981 Reviewed-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-vbi.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-vbi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index 0044079f5da2..81a2aedeff5c 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -137,6 +137,8 @@ static int buffer_prepare(struct videobuf_queue *q,
137 saa7134_dma_free(q,buf); 137 saa7134_dma_free(q,buf);
138 138
139 if (STATE_NEEDS_INIT == buf->vb.state) { 139 if (STATE_NEEDS_INIT == buf->vb.state) {
140 struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
141
140 buf->vb.width = llength; 142 buf->vb.width = llength;
141 buf->vb.height = lines; 143 buf->vb.height = lines;
142 buf->vb.size = size; 144 buf->vb.size = size;
@@ -146,8 +148,8 @@ static int buffer_prepare(struct videobuf_queue *q,
146 if (err) 148 if (err)
147 goto oops; 149 goto oops;
148 err = saa7134_pgtable_build(dev->pci,buf->pt, 150 err = saa7134_pgtable_build(dev->pci,buf->pt,
149 buf->vb.dma.sglist, 151 dma->sglist,
150 buf->vb.dma.sglen, 152 dma->sglen,
151 saa7134_buffer_startpage(buf)); 153 saa7134_buffer_startpage(buf));
152 if (err) 154 if (err)
153 goto oops; 155 goto oops;