diff options
Diffstat (limited to 'linux/drivers/media/video/cx88/cx88-vbi.c')
-rw-r--r-- | linux/drivers/media/video/cx88/cx88-vbi.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c index f7b791bc9..ca2d70e55 100644 --- a/linux/drivers/media/video/cx88/cx88-vbi.c +++ b/linux/drivers/media/video/cx88/cx88-vbi.c @@ -1,5 +1,5 @@ /* - * $Id: cx88-vbi.c,v 1.9 2004/09/15 16:15:24 kraxel Exp $ + * $Id: cx88-vbi.c,v 1.10 2004/09/23 13:58:19 kraxel Exp $ */ #include <linux/kernel.h> #include <linux/module.h> @@ -127,7 +127,7 @@ void cx8800_vbi_timeout(unsigned long data) /* ------------------------------------------------------------------ */ static int -vbi_setup(struct file *file, unsigned int *count, unsigned int *size) +vbi_setup(void *priv, unsigned int *count, unsigned int *size) { *size = VBI_LINE_COUNT * VBI_LINE_LENGTH * 2; if (0 == *count) @@ -140,10 +140,10 @@ vbi_setup(struct file *file, unsigned int *count, unsigned int *size) } static int -vbi_prepare(struct file *file, struct videobuf_buffer *vb, +vbi_prepare(void *priv, struct videobuf_buffer *vb, enum v4l2_field field) { - struct cx8800_fh *fh = file->private_data; + struct cx8800_fh *fh = priv; struct cx8800_dev *dev = fh->dev; struct cx88_buffer *buf = (struct cx88_buffer*)vb; unsigned int size; @@ -176,11 +176,11 @@ vbi_prepare(struct file *file, struct videobuf_buffer *vb, } static void -vbi_queue(struct file *file, struct videobuf_buffer *vb) +vbi_queue(void *priv, struct videobuf_buffer *vb) { struct cx88_buffer *buf = (struct cx88_buffer*)vb; struct cx88_buffer *prev; - struct cx8800_fh *fh = file->private_data; + struct cx8800_fh *fh = priv; struct cx8800_dev *dev = fh->dev; struct cx88_dmaqueue *q = &dev->vbiq; @@ -208,10 +208,10 @@ vbi_queue(struct file *file, struct videobuf_buffer *vb) } } -static void vbi_release(struct file *file, struct videobuf_buffer *vb) +static void vbi_release(void *priv, struct videobuf_buffer *vb) { struct cx88_buffer *buf = (struct cx88_buffer*)vb; - struct cx8800_fh *fh = file->private_data; + struct cx8800_fh *fh = priv; cx88_free_buffer(fh->dev->pci,buf); } |