X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fsaa7134%2Fsaa7134-vbi.c;h=01451b37af990c17ba30eec804e24af909ac0e80;hb=9e1bf581d67d87a1d7fc0ea500729e3a03643a26;hp=5707e9021bc739f673dc9319495b137ed440cec3;hpb=8d40237c730b8be87c1b80a5d96b9c603fefa829;p=linux-2.6.git

diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c
index 5707e9021..01451b37a 100644
--- a/drivers/media/video/saa7134/saa7134-vbi.c
+++ b/drivers/media/video/saa7134/saa7134-vbi.c
@@ -1,6 +1,4 @@
 /*
- * $Id: saa7134-vbi.c,v 1.5 2004/11/07 13:17:15 kraxel Exp $
- *
  * device driver for philips saa7134 based TV cards
  * video4linux video interface
  *
@@ -33,11 +31,11 @@
 /* ------------------------------------------------------------------ */
 
 static unsigned int vbi_debug  = 0;
-module_param(vbi_debug, int, 0644);
+MODULE_PARM(vbi_debug,"i");
 MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
 
 static unsigned int vbibufs = 4;
-module_param(vbibufs, int, 0444);
+MODULE_PARM(vbibufs,"i");
 MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32");
 
 #define dprintk(fmt, arg...)	if (vbi_debug) \
@@ -53,7 +51,7 @@ static void task_init(struct saa7134_dev *dev, struct saa7134_buf *buf,
 		      int task)
 {
 	struct saa7134_tvnorm *norm = dev->tvnorm;
-
+	
 	/* setup video scaler */
 	saa_writeb(SAA7134_VBI_H_START1(task), norm->h_start     &  0xff);
 	saa_writeb(SAA7134_VBI_H_START2(task), norm->h_start     >> 8);
@@ -115,13 +113,12 @@ static int buffer_activate(struct saa7134_dev *dev,
 	return 0;
 }
 
-static int buffer_prepare(struct videobuf_queue *q,
-			  struct videobuf_buffer *vb,
+static int buffer_prepare(struct file *file, struct videobuf_buffer *vb,
 			  enum v4l2_field field)
 {
-	struct saa7134_fh *fh   = q->priv_data;
+	struct saa7134_fh *fh   = file->private_data;
 	struct saa7134_dev *dev = fh->dev;
-	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
+	struct saa7134_buf *buf = (struct saa7134_buf *)vb;
 	struct saa7134_tvnorm *norm = dev->tvnorm;
 	unsigned int lines, llength, size;
 	int err;
@@ -170,12 +167,12 @@ static int buffer_prepare(struct videobuf_queue *q,
 }
 
 static int
-buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
+buffer_setup(struct file *file, unsigned int *count, unsigned int *size)
 {
-	struct saa7134_fh *fh   = q->priv_data;
+	struct saa7134_fh *fh   = file->private_data;
 	struct saa7134_dev *dev = fh->dev;
 	int llength,lines;
-
+	
 	lines   = dev->tvnorm->vbi_v_stop - dev->tvnorm->vbi_v_start +1;
 #if 1
 	llength = VBI_LINE_LENGTH;
@@ -191,21 +188,21 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
 	return 0;
 }
 
-static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static void buffer_queue(struct file *file, struct videobuf_buffer *vb)
 {
-	struct saa7134_fh *fh = q->priv_data;
+	struct saa7134_fh *fh = file->private_data;
 	struct saa7134_dev *dev = fh->dev;
-	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
-
+	struct saa7134_buf *buf = (struct saa7134_buf *)vb;
+	
 	saa7134_buffer_queue(dev,&dev->vbi_q,buf);
 }
 
-static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static void buffer_release(struct file *file, struct videobuf_buffer *vb)
 {
-	struct saa7134_fh *fh   = q->priv_data;
+	struct saa7134_fh *fh   = file->private_data;
 	struct saa7134_dev *dev = fh->dev;
-	struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
-
+	struct saa7134_buf *buf = (struct saa7134_buf *)vb;
+	
 	saa7134_dma_free(dev,buf);
 }