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, 3 insertions, 219 deletions

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index ad62d322e178..d9149cd25b31 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -39,6 +39,8 @@
 #define VFL_TYPE_RADIO          2
 #define VFL_TYPE_VTX            3
 
+struct v4l2_ioctl_callbacks;
+
 /*
  * Newer version of video_device, handled by videodev2.c
  *      This version moves redundant code from video device code to
@@ -72,225 +74,7 @@ struct video_device
         void (*release)(struct video_device *vfd);
 
         /* ioctl callbacks */
-
-        /* VIDIOC_QUERYCAP handler */
-        int (*vidioc_querycap)(struct file *file, void *fh, struct v4l2_capability *cap);
-
-        /* Priority handling */
-        int (*vidioc_g_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority *p);
-        int (*vidioc_s_priority)   (struct file *file, void *fh,
-                                    enum v4l2_priority p);
-
-        /* VIDIOC_ENUM_FMT handlers */
-        int (*vidioc_enum_fmt_vid_cap)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-        int (*vidioc_enum_fmt_vid_overlay) (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-        int (*vidioc_enum_fmt_vid_out)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-#if 1
-        /* deprecated, will be removed in 2.6.28 */
-        int (*vidioc_enum_fmt_vbi_cap)     (struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-#endif
-        int (*vidioc_enum_fmt_type_private)(struct file *file, void *fh,
-                                            struct v4l2_fmtdesc *f);
-
-        /* VIDIOC_G_FMT handlers */
-        int (*vidioc_g_fmt_vid_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vbi_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_vbi_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_g_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-
-        /* VIDIOC_S_FMT handlers */
-        int (*vidioc_s_fmt_vid_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vbi_cap)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_vbi_out)    (struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-        int (*vidioc_s_fmt_type_private)(struct file *file, void *fh,
-                                        struct v4l2_format *f);
-
-        /* VIDIOC_TRY_FMT handlers */
-        int (*vidioc_try_fmt_vid_cap)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_overlay)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_out)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vid_out_overlay)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vbi_cap)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_vbi_out)    (struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_sliced_vbi_cap)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_sliced_vbi_out)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-        int (*vidioc_try_fmt_type_private)(struct file *file, void *fh,
-                                          struct v4l2_format *f);
-
-        /* Buffer handlers */
-        int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b);
-        int (*vidioc_querybuf)(struct file *file, void *fh, struct v4l2_buffer *b);
-        int (*vidioc_qbuf)    (struct file *file, void *fh, struct v4l2_buffer *b);
-        int (*vidioc_dqbuf)   (struct file *file, void *fh, struct v4l2_buffer *b);
-
-
-        int (*vidioc_overlay) (struct file *file, void *fh, unsigned int i);
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-                        /* buffer type is struct vidio_mbuf * */
-        int (*vidiocgmbuf)  (struct file *file, void *fh, struct video_mbuf *p);
-#endif
-        int (*vidioc_g_fbuf)   (struct file *file, void *fh,
-                                struct v4l2_framebuffer *a);
-        int (*vidioc_s_fbuf)   (struct file *file, void *fh,
-                                struct v4l2_framebuffer *a);
-
-                /* Stream on/off */
-        int (*vidioc_streamon) (struct file *file, void *fh, enum v4l2_buf_type i);
-        int (*vidioc_streamoff)(struct file *file, void *fh, enum v4l2_buf_type i);
-
-                /* Standard handling
-                        ENUMSTD is handled by videodev.c
-                 */
-        int (*vidioc_g_std) (struct file *file, void *fh, v4l2_std_id *norm);
-        int (*vidioc_s_std) (struct file *file, void *fh, v4l2_std_id *norm);
-        int (*vidioc_querystd) (struct file *file, void *fh, v4l2_std_id *a);
-
-                /* Input handling */
-        int (*vidioc_enum_input)(struct file *file, void *fh,
-                                 struct v4l2_input *inp);
-        int (*vidioc_g_input)   (struct file *file, void *fh, unsigned int *i);
-        int (*vidioc_s_input)   (struct file *file, void *fh, unsigned int i);
-
-                /* Output handling */
-        int (*vidioc_enum_output) (struct file *file, void *fh,
-                                  struct v4l2_output *a);
-        int (*vidioc_g_output)   (struct file *file, void *fh, unsigned int *i);
-        int (*vidioc_s_output)   (struct file *file, void *fh, unsigned int i);
-
-                /* Control handling */
-        int (*vidioc_queryctrl)        (struct file *file, void *fh,
-                                        struct v4l2_queryctrl *a);
-        int (*vidioc_g_ctrl)           (struct file *file, void *fh,
-                                        struct v4l2_control *a);
-        int (*vidioc_s_ctrl)           (struct file *file, void *fh,
-                                        struct v4l2_control *a);
-        int (*vidioc_g_ext_ctrls)      (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_s_ext_ctrls)      (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_try_ext_ctrls)    (struct file *file, void *fh,
-                                        struct v4l2_ext_controls *a);
-        int (*vidioc_querymenu)        (struct file *file, void *fh,
-                                        struct v4l2_querymenu *a);
-
-        /* Audio ioctls */
-        int (*vidioc_enumaudio)        (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-        int (*vidioc_g_audio)          (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-        int (*vidioc_s_audio)          (struct file *file, void *fh,
-                                        struct v4l2_audio *a);
-
-        /* Audio out ioctls */
-        int (*vidioc_enumaudout)       (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_g_audout)         (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_s_audout)         (struct file *file, void *fh,
-                                        struct v4l2_audioout *a);
-        int (*vidioc_g_modulator)      (struct file *file, void *fh,
-                                        struct v4l2_modulator *a);
-        int (*vidioc_s_modulator)      (struct file *file, void *fh,
-                                        struct v4l2_modulator *a);
-        /* Crop ioctls */
-        int (*vidioc_cropcap)          (struct file *file, void *fh,
-                                        struct v4l2_cropcap *a);
-        int (*vidioc_g_crop)           (struct file *file, void *fh,
-                                        struct v4l2_crop *a);
-        int (*vidioc_s_crop)           (struct file *file, void *fh,
-                                        struct v4l2_crop *a);
-        /* Compression ioctls */
-        int (*vidioc_g_jpegcomp)       (struct file *file, void *fh,
-                                        struct v4l2_jpegcompression *a);
-        int (*vidioc_s_jpegcomp)       (struct file *file, void *fh,
-                                        struct v4l2_jpegcompression *a);
-        int (*vidioc_g_enc_index)      (struct file *file, void *fh,
-                                        struct v4l2_enc_idx *a);
-        int (*vidioc_encoder_cmd)      (struct file *file, void *fh,
-                                        struct v4l2_encoder_cmd *a);
-        int (*vidioc_try_encoder_cmd)  (struct file *file, void *fh,
-                                        struct v4l2_encoder_cmd *a);
-
-        /* Stream type-dependent parameter ioctls */
-        int (*vidioc_g_parm)           (struct file *file, void *fh,
-                                        struct v4l2_streamparm *a);
-        int (*vidioc_s_parm)           (struct file *file, void *fh,
-                                        struct v4l2_streamparm *a);
-
-        /* Tuner ioctls */
-        int (*vidioc_g_tuner)          (struct file *file, void *fh,
-                                        struct v4l2_tuner *a);
-        int (*vidioc_s_tuner)          (struct file *file, void *fh,
-                                        struct v4l2_tuner *a);
-        int (*vidioc_g_frequency)      (struct file *file, void *fh,
-                                        struct v4l2_frequency *a);
-        int (*vidioc_s_frequency)      (struct file *file, void *fh,
-                                        struct v4l2_frequency *a);
-
-        /* Sliced VBI cap */
-        int (*vidioc_g_sliced_vbi_cap) (struct file *file, void *fh,
-                                        struct v4l2_sliced_vbi_cap *a);
-
-        /* Log status ioctl */
-        int (*vidioc_log_status)       (struct file *file, void *fh);
-
-        int (*vidioc_s_hw_freq_seek)   (struct file *file, void *fh,
-                                        struct v4l2_hw_freq_seek *a);
-
-        /* Debugging ioctls */
-#ifdef CONFIG_VIDEO_ADV_DEBUG
-        int (*vidioc_g_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
-        int (*vidioc_s_register)       (struct file *file, void *fh,
-                                        struct v4l2_register *reg);
-#endif
-        int (*vidioc_g_chip_ident)     (struct file *file, void *fh,
-                                        struct v4l2_chip_ident *chip);
-
-        /* For other private ioctls */
-        int (*vidioc_default)          (struct file *file, void *fh,
-                                        int cmd, void *arg);
-
+        const struct v4l2_ioctl_ops *ioctl_ops;
 
 #ifdef OBSOLETE_OWNER /* to be removed soon */
 /* obsolete -- fops->owner is used instead */