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, 9 insertions, 6 deletions

diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index a9914dbcf493..3a67471f999c 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -367,12 +367,7 @@ static const struct file_operations terratec_fops = {
         .llseek         = no_llseek,
 };
 
-static struct video_device terratec_radio=
-{
-        .owner          = THIS_MODULE,
-        .name           = "TerraTec ActiveRadio",
-        .type           = VID_TYPE_TUNER,
-        .fops           = &terratec_fops,
+static const struct v4l2_ioctl_ops terratec_ioctl_ops = {
         .vidioc_querycap    = vidioc_querycap,
         .vidioc_g_tuner     = vidioc_g_tuner,
         .vidioc_s_tuner     = vidioc_s_tuner,
@@ -387,6 +382,14 @@ static struct video_device terratec_radio=
         .vidioc_s_input     = vidioc_s_input,
 };
 
+static struct video_device terratec_radio = {
+        .owner          = THIS_MODULE,
+        .name           = "TerraTec ActiveRadio",
+        .type           = VID_TYPE_TUNER,
+        .fops           = &terratec_fops,
+        .ioctl_ops      = &terratec_ioctl_ops,
+};
+
 static int __init terratec_init(void)
 {
         if(io==-1)