[media] v4l2-core: drop g/s_priority ops

The handling of VIDIOC_G/S_PRIORITY is now entirely done by the V4L2
core, so we can drop the g/s_priority ioctl ops.

We do have to make sure though that when S_PRIORITY is called we check
that the driver used struct v4l2_fh. This check can be removed once all
drivers are converted to that structure.

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

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index b08407225db1..09ad8ddfaaf9 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1046,8 +1046,6 @@ static int v4l_g_priority(const struct v4l2_ioctl_ops *ops,
         struct video_device *vfd;
         u32 *p = arg;
 
-        if (ops->vidioc_g_priority)
-                return ops->vidioc_g_priority(file, fh, arg);
         vfd = video_devdata(file);
         *p = v4l2_prio_max(vfd->prio);
         return 0;
@@ -1060,9 +1058,9 @@ static int v4l_s_priority(const struct v4l2_ioctl_ops *ops,
         struct v4l2_fh *vfh;
         u32 *p = arg;
 
-        if (ops->vidioc_s_priority)
-                return ops->vidioc_s_priority(file, fh, *p);
         vfd = video_devdata(file);
+        if (!test_bit(V4L2_FL_USES_V4L2_FH, &vfd->flags))
+                return -ENOTTY;
         vfh = file->private_data;
         return v4l2_prio_change(vfd->prio, &vfh->prio, *p);
 }