[media] saa7134: move qos_request from saa7134_fh to saa7134_dev

This is a global field, not a per-filehandle field.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 30832d38fb549ed816f9dae188cb7855277f9746..a7baa246b65314a0e878441dd4b5158baa021fff 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -2205,7 +2205,7 @@ static int saa7134_streamon(struct file *file, void *priv,
         * Unfortunately, I lack register-level documentation to check the
         * Linux FIFO setup and confirm the perfect value.
         */
-       pm_qos_add_request(&fh->qos_request,
+       pm_qos_add_request(&dev->qos_request,
                           PM_QOS_CPU_DMA_LATENCY,
                           20);
 
@@ -2220,7 +2220,7 @@ static int saa7134_streamoff(struct file *file, void *priv,
        struct saa7134_dev *dev = fh->dev;
        int res = saa7134_resource(file);
 
-       pm_qos_remove_request(&fh->qos_request);
+       pm_qos_remove_request(&dev->qos_request);
 
        err = videobuf_streamoff(saa7134_queue(file));
        if (err < 0)

diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 8a62ff733343b75fc55446e0b499c7bbac5f4c9b..8d1453a48014f6a2e29bfabe77d63ef763fd535a 100644 (file)
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -472,7 +472,6 @@ struct saa7134_fh {
        struct v4l2_fh             fh;
        struct saa7134_dev         *dev;
        unsigned int               resources;
-       struct pm_qos_request      qos_request;
 
        /* video capture */
        struct videobuf_queue      cap;
@@ -595,6 +594,7 @@ struct saa7134_dev {
        unsigned int               vbi_fieldcount;
        struct saa7134_format      *fmt;
        unsigned int               width, height;
+       struct pm_qos_request      qos_request;
 
        /* various v4l controls */
        struct saa7134_tvnorm      *tvnorm;              /* video */