diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-23 15:37:49 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 21:14:55 -0400 |
commit | c1accaa21bdef38ec0f36eaaf7ce3384fff9d0c5 (patch) | |
tree | 3a2c8206555af6c9e2eecdb20b052be70e6b93dd /drivers/media/video/cx88/cx88-mpeg.c | |
parent | 7a7d9a89d0307b1743d782197e2c5fc5ddf183f3 (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/cx88/cx88-mpeg.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-mpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index d302793fcfb9..a652f294d23d 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
@@ -237,6 +237,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev, | |||
237 | struct cx88_buffer *buf, enum v4l2_field field) | 237 | struct cx88_buffer *buf, enum v4l2_field field) |
238 | { | 238 | { |
239 | int size = dev->ts_packet_size * dev->ts_packet_count; | 239 | int size = dev->ts_packet_size * dev->ts_packet_count; |
240 | struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb); | ||
240 | int rc; | 241 | int rc; |
241 | 242 | ||
242 | dprintk(1, "%s: %p\n", __FUNCTION__, buf); | 243 | dprintk(1, "%s: %p\n", __FUNCTION__, buf); |
@@ -252,7 +253,7 @@ int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev, | |||
252 | if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL))) | 253 | if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL))) |
253 | goto fail; | 254 | goto fail; |
254 | cx88_risc_databuffer(dev->pci, &buf->risc, | 255 | cx88_risc_databuffer(dev->pci, &buf->risc, |
255 | buf->vb.dma.sglist, | 256 | dma->sglist, |
256 | buf->vb.width, buf->vb.height, 0); | 257 | buf->vb.width, buf->vb.height, 0); |
257 | } | 258 | } |
258 | buf->vb.state = STATE_PREPARED; | 259 | buf->vb.state = STATE_PREPARED; |