media: pvrusb2: Remove g/s_ctrl callbacks

The ioctl helpers can emulate g/s_ctrl with g/s_ext_ctrl. Simplify the
code.

Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
index 7c8be6a0cf7c71f1a3d8d8f7fbcf10b57b0bd4d5..ad38e12405419caad056af8866b14ea621f0c2a1 100644 (file)
--- a/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-v4l2.c
@@ -574,31 +574,6 @@ static int pvr2_querymenu(struct file *file, void *priv, struct v4l2_querymenu *
        return ret;
 }
 
-static int pvr2_g_ctrl(struct file *file, void *priv, struct v4l2_control *vc)
-{
-       struct pvr2_v4l2_fh *fh = file->private_data;
-       struct pvr2_hdw *hdw = fh->channel.mc_head->hdw;
-       int val = 0;
-       int ret;
-
-       ret = pvr2_ctrl_get_value(pvr2_hdw_get_ctrl_v4l(hdw, vc->id),
-                       &val);
-       vc->value = val;
-       return ret;
-}
-
-static int pvr2_s_ctrl(struct file *file, void *priv, struct v4l2_control *vc)
-{
-       struct pvr2_v4l2_fh *fh = file->private_data;
-       struct pvr2_hdw *hdw = fh->channel.mc_head->hdw;
-       int ret;
-
-       ret = pvr2_ctrl_set_value(pvr2_hdw_get_ctrl_v4l(hdw, vc->id),
-                       vc->value);
-       pvr2_hdw_commit_ctl(hdw);
-       return ret;
-}
-
 static int pvr2_g_ext_ctrls(struct file *file, void *priv,
                                        struct v4l2_ext_controls *ctls)
 {
@@ -817,8 +792,6 @@ static const struct v4l2_ioctl_ops pvr2_ioctl_ops = {
        .vidioc_streamoff                   = pvr2_streamoff,
        .vidioc_query_ext_ctrl              = pvr2_query_ext_ctrl,
        .vidioc_querymenu                   = pvr2_querymenu,
-       .vidioc_g_ctrl                      = pvr2_g_ctrl,
-       .vidioc_s_ctrl                      = pvr2_s_ctrl,
        .vidioc_g_ext_ctrls                 = pvr2_g_ext_ctrls,
        .vidioc_s_ext_ctrls                 = pvr2_s_ext_ctrls,
        .vidioc_try_ext_ctrls               = pvr2_try_ext_ctrls,