V4L/DVB (8113): ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrl

videodev converts old-style controls to an extended control so the ivtv and
cx18 drivers no longer have to handle both.

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

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 42443b42336d..52e00a7f3110 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -692,7 +692,7 @@ static int ivtv_itvc(struct ivtv *itv, unsigned int cmd, void *arg)
 {
         struct v4l2_register *regs = arg;
         unsigned long flags;
-        u8 __iomem *reg_start;
+        volatile u8 __iomem *reg_start;
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
@@ -1904,8 +1904,6 @@ void ivtv_set_funcs(struct video_device *vdev)
         vdev->vidioc_default                = ivtv_default;
         vdev->vidioc_queryctrl              = ivtv_queryctrl;
         vdev->vidioc_querymenu              = ivtv_querymenu;
-        vdev->vidioc_g_ctrl                 = ivtv_g_ctrl;
-        vdev->vidioc_s_ctrl                 = ivtv_s_ctrl;
         vdev->vidioc_g_ext_ctrls            = ivtv_g_ext_ctrls;
         vdev->vidioc_s_ext_ctrls            = ivtv_s_ext_ctrls;
         vdev->vidioc_try_ext_ctrls          = ivtv_try_ext_ctrls;