V4L/DVB (8482): videodev: move all ioctl callbacks to a new v4l2_ioctl_ops struct

All ioctl callbacks are now stored in a new v4l2_ioctl_ops struct. Drivers fill in
a const struct v4l2_ioctl_ops and video_device just contains a const pointer to it.

This ensures a clean separation between the const ops struct and the non-const
video_device struct.

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

1 files changed, 11 insertions, 8 deletions

diff --git a/drivers/media/video/zr364xx.c b/drivers/media/video/zr364xx.c
index ea5265c22983..617ed2856b22 100644
--- a/drivers/media/video/zr364xx.c
+++ b/drivers/media/video/zr364xx.c
@@ -762,14 +762,7 @@ static const struct file_operations zr364xx_fops = {
         .llseek = no_llseek,
 };
 
-static struct video_device zr364xx_template = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_DESC,
-        .type = VID_TYPE_CAPTURE,
-        .fops = &zr364xx_fops,
-        .release = video_device_release,
-        .minor = -1,
-
+static const struct v4l2_ioctl_ops zr364xx_ioctl_ops = {
         .vidioc_querycap        = zr364xx_vidioc_querycap,
         .vidioc_enum_fmt_vid_cap = zr364xx_vidioc_enum_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap = zr364xx_vidioc_try_fmt_vid_cap,
@@ -785,6 +778,16 @@ static struct video_device zr364xx_template = {
         .vidioc_s_ctrl          = zr364xx_vidioc_s_ctrl,
 };
 
+static struct video_device zr364xx_template = {
+        .owner = THIS_MODULE,
+        .name = DRIVER_DESC,
+        .type = VID_TYPE_CAPTURE,
+        .fops = &zr364xx_fops,
+        .ioctl_ops = &zr364xx_ioctl_ops,
+        .release = video_device_release,
+        .minor = -1,
+};
+
 
 
 /*******************/