V4L/DVB: v4l2-common: simplify prio utility functions

v4l2_prio_init/open/close returned an int when in fact they would
always return 0. Make these void functions.

v4l2_prio_close and v4l2_prio_check pass an enum v4l2_priority as a
pointer for no good reason. Replace with a normal enum v4l2_priority
argument.

These changes will simplify the work of moving priority handling into
the v4l core.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 7806fb17e742..45f0ac8f3c0f 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1180,7 +1180,7 @@ int saa7134_s_ctrl_internal(struct saa7134_dev *dev,  struct saa7134_fh *fh, str
            That needs to be fixed somehow, but for now this is
            good enough. */
         if (fh) {
-                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                err = v4l2_prio_check(&dev->prio, fh->prio);
                 if (0 != err)
                         return err;
         }
@@ -1359,7 +1359,7 @@ static int video_open(struct file *file)
         fh->fmt      = format_by_fourcc(V4L2_PIX_FMT_BGR24);
         fh->width    = 720;
         fh->height   = 576;
-        v4l2_prio_open(&dev->prio,&fh->prio);
+        v4l2_prio_open(&dev->prio, &fh->prio);
 
         videobuf_queue_sg_init(&fh->cap, &video_qops,
                             &dev->pci->dev, &dev->slock,
@@ -1502,7 +1502,7 @@ static int video_release(struct file *file)
         saa7134_pgtable_free(dev->pci,&fh->pt_cap);
         saa7134_pgtable_free(dev->pci,&fh->pt_vbi);
 
-        v4l2_prio_close(&dev->prio,&fh->prio);
+        v4l2_prio_close(&dev->prio, fh->prio);
         file->private_data = NULL;
         kfree(fh);
         return 0;
@@ -1785,7 +1785,7 @@ static int saa7134_s_input(struct file *file, void *priv, unsigned int i)
         struct saa7134_dev *dev = fh->dev;
         int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
+        err = v4l2_prio_check(&dev->prio, fh->prio);
         if (0 != err)
                 return err;
 
@@ -1839,7 +1839,7 @@ int saa7134_s_std_internal(struct saa7134_dev *dev, struct saa7134_fh *fh, v4l2_
            That needs to be fixed somehow, but for now this is
            good enough. */
         if (fh) {
-                err = v4l2_prio_check(&dev->prio, &fh->prio);
+                err = v4l2_prio_check(&dev->prio, fh->prio);
                 if (0 != err)
                         return err;
         } else if (res_locked(dev, RESOURCE_OVERLAY)) {
@@ -2023,7 +2023,7 @@ static int saa7134_s_tuner(struct file *file, void *priv,
         struct saa7134_dev *dev = fh->dev;
         int rx, mode, err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
+        err = v4l2_prio_check(&dev->prio, fh->prio);
         if (0 != err)
                 return err;
 
@@ -2057,7 +2057,7 @@ static int saa7134_s_frequency(struct file *file, void *priv,
         struct saa7134_dev *dev = fh->dev;
         int err;
 
-        err = v4l2_prio_check(&dev->prio, &fh->prio);
+        err = v4l2_prio_check(&dev->prio, fh->prio);
         if (0 != err)
                 return err;