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, 20 insertions, 13 deletions

diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index f8cc55db9f42..24b403b238d1 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1683,13 +1683,7 @@ static const struct file_operations video_fops =
         .llseek        = no_llseek,
 };
 
-static struct video_device cx8800_vbi_template;
-static struct video_device cx8800_video_template =
-{
-        .name                 = "cx8800-video",
-        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
-        .fops                 = &video_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_querycap      = vidioc_querycap,
         .vidioc_enum_fmt_vid_cap  = vidioc_enum_fmt_vid_cap,
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
@@ -1722,6 +1716,16 @@ static struct video_device cx8800_video_template =
         .vidioc_g_register    = vidioc_g_register,
         .vidioc_s_register    = vidioc_s_register,
 #endif
+};
+
+static struct video_device cx8800_vbi_template;
+
+static struct video_device cx8800_video_template = {
+        .name                 = "cx8800-video",
+        .type                 = VID_TYPE_CAPTURE|VID_TYPE_TUNER|VID_TYPE_SCALES,
+        .fops                 = &video_fops,
+        .minor                = -1,
+        .ioctl_ops            = &video_ioctl_ops,
         .tvnorms              = CX88_NORMS,
         .current_norm         = V4L2_STD_NTSC_M,
 };
@@ -1736,12 +1740,7 @@ static const struct file_operations radio_fops =
         .llseek        = no_llseek,
 };
 
-static struct video_device cx8800_radio_template =
-{
-        .name                 = "cx8800-radio",
-        .type                 = VID_TYPE_TUNER,
-        .fops                 = &radio_fops,
-        .minor                = -1,
+static const struct v4l2_ioctl_ops radio_ioctl_ops = {
         .vidioc_querycap      = radio_querycap,
         .vidioc_g_tuner       = radio_g_tuner,
         .vidioc_enum_input    = radio_enum_input,
@@ -1760,6 +1759,14 @@ static struct video_device cx8800_radio_template =
 #endif
 };
 
+static struct video_device cx8800_radio_template = {
+        .name                 = "cx8800-radio",
+        .type                 = VID_TYPE_TUNER,
+        .fops                 = &radio_fops,
+        .minor                = -1,
+        .ioctl_ops            = &radio_ioctl_ops,
+};
+
 /* ----------------------------------------------------------- */
 
 static void cx8800_unregister_video(struct cx8800_dev *dev)