[media] saa7134: move the queue data from saa7134_fh to saa7134_dev

These fields are global, not per-filehandle.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

4 files changed, 63 insertions, 64 deletions

diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 27d7ee709c58..f442405568d8 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -751,6 +751,7 @@ static int saa7134_hwfini(struct saa7134_dev *dev)
         saa7134_input_fini(dev);
         saa7134_vbi_fini(dev);
         saa7134_tvaudio_fini(dev);
+        saa7134_video_fini(dev);
         return 0;
 }
 
diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index e9aa94b807f1..d4da18d049f3 100644
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -117,8 +117,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                           struct videobuf_buffer *vb,
                           enum v4l2_field field)
 {
-        struct saa7134_fh *fh   = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
+        struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
         struct saa7134_tvnorm *norm = dev->tvnorm;
         unsigned int lines, llength, size;
@@ -141,7 +140,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 buf->vb.width  = llength;
                 buf->vb.height = lines;
                 buf->vb.size   = size;
-                buf->pt        = &fh->pt_vbi;
+                buf->pt        = &dev->pt_vbi;
 
                 err = videobuf_iolock(q,&buf->vb,NULL);
                 if (err)
@@ -166,8 +165,7 @@ static int buffer_prepare(struct videobuf_queue *q,
 static int
 buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
 {
-        struct saa7134_fh *fh   = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
+        struct saa7134_dev *dev = q->priv_data;
         int llength,lines;
 
         lines   = dev->tvnorm->vbi_v_stop_0 - dev->tvnorm->vbi_v_start_0 +1;
@@ -181,8 +179,7 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
 
 static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_fh *fh = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
+        struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
         saa7134_buffer_queue(dev,&dev->vbi_q,buf);
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index fb60da85bc2c..8f73058f901e 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1018,8 +1018,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                           struct videobuf_buffer *vb,
                           enum v4l2_field field)
 {
-        struct saa7134_fh *fh = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
+        struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
         unsigned int size;
         int err;
@@ -1057,7 +1056,7 @@ static int buffer_prepare(struct videobuf_queue *q,
                 buf->vb.size   = size;
                 buf->vb.field  = field;
                 buf->fmt       = dev->fmt;
-                buf->pt        = &fh->pt_cap;
+                buf->pt        = &dev->pt_cap;
                 dev->video_q.curr = NULL;
 
                 err = videobuf_iolock(q,&buf->vb,&dev->ovbuf);
@@ -1082,8 +1081,7 @@ static int buffer_prepare(struct videobuf_queue *q,
 static int
 buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
 {
-        struct saa7134_fh *fh = q->priv_data;
-        struct saa7134_dev *dev = fh->dev;
+        struct saa7134_dev *dev = q->priv_data;
 
         *size = dev->fmt->depth * dev->width * dev->height >> 3;
         if (0 == *count)
@@ -1094,10 +1092,10 @@ buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
 
 static void buffer_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
 {
-        struct saa7134_fh *fh = q->priv_data;
+        struct saa7134_dev *dev = q->priv_data;
         struct saa7134_buf *buf = container_of(vb,struct saa7134_buf,vb);
 
-        saa7134_buffer_queue(fh->dev,&fh->dev->video_q,buf);
+        saa7134_buffer_queue(dev, &dev->video_q, buf);
 }
 
 static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
@@ -1293,14 +1291,15 @@ static struct videobuf_queue *saa7134_queue(struct file *file)
 {
         struct video_device *vdev = video_devdata(file);
         struct saa7134_fh *fh = file->private_data;
+        struct saa7134_dev *dev = fh->dev;
         struct videobuf_queue *q = NULL;
 
         switch (vdev->vfl_type) {
         case VFL_TYPE_GRABBER:
-                q = &fh->cap;
+                q = &dev->cap;
                 break;
         case VFL_TYPE_VBI:
-                q = &fh->vbi;
+                q = &dev->vbi;
                 break;
         default:
                 BUG();
@@ -1337,21 +1336,6 @@ static int video_open(struct file *file)
         file->private_data = fh;
         fh->dev      = dev;
 
-        videobuf_queue_sg_init(&fh->cap, &video_qops,
-                            &dev->pci->dev, &dev->slock,
-                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                            V4L2_FIELD_INTERLACED,
-                            sizeof(struct saa7134_buf),
-                            fh, NULL);
-        videobuf_queue_sg_init(&fh->vbi, &saa7134_vbi_qops,
-                            &dev->pci->dev, &dev->slock,
-                            V4L2_BUF_TYPE_VBI_CAPTURE,
-                            V4L2_FIELD_SEQ_TB,
-                            sizeof(struct saa7134_buf),
-                            fh, NULL);
-        saa7134_pgtable_alloc(dev->pci,&fh->pt_cap);
-        saa7134_pgtable_alloc(dev->pci,&fh->pt_vbi);
-
         if (vdev->vfl_type == VFL_TYPE_RADIO) {
                 /* switch to radio mode */
                 saa7134_tvaudio_setinput(dev,&card(dev).radio);
@@ -1396,28 +1380,30 @@ video_poll(struct file *file, struct poll_table_struct *wait)
 {
         struct video_device *vdev = video_devdata(file);
         struct saa7134_fh *fh = file->private_data;
+        struct saa7134_dev *dev = fh->dev;