V4L/DVB (10271): saa7146: convert to video_ioctl2.

The conversion to video_ioctl2 is the first phase to converting this driver
to the latest v4l2 framework.

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

1 files changed, 5 insertions, 12 deletions

diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h
index c8d0b23fde29..eed5fccc83f3 100644
--- a/include/media/saa7146_vv.h
+++ b/include/media/saa7146_vv.h
@@ -150,16 +150,6 @@ struct saa7146_vv
         unsigned int resources; /* resource management for device */
 };
 
-#define SAA7146_EXCLUSIVE       0x1
-#define SAA7146_BEFORE          0x2
-#define SAA7146_AFTER           0x4
-
-struct saa7146_extension_ioctls
-{
-        unsigned int    cmd;
-        int             flags;
-};
-
 /* flags */
 #define SAA7146_USE_PORT_B_FOR_VBI      0x2     /* use input port b for vbi hardware bug workaround */
 
@@ -176,8 +166,10 @@ struct saa7146_ext_vv
         int num_stds;
         int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
 
-        struct saa7146_extension_ioctls *ioctls;
-        long (*ioctl)(struct saa7146_fh *, unsigned int cmd, void *arg);
+        /* the extension can override this */
+        struct v4l2_ioctl_ops ops;
+        /* pointer to the saa7146 core ops */
+        const struct v4l2_ioctl_ops *core_ops;
 
         struct v4l2_file_operations vbi_fops;
 };
@@ -213,6 +205,7 @@ void saa7146_set_hps_source_and_sync(struct saa7146_dev *saa, int source, int sy
 void saa7146_set_gpio(struct saa7146_dev *saa, u8 pin, u8 data);
 
 /* from saa7146_video.c */
+extern const struct v4l2_ioctl_ops saa7146_video_ioctl_ops;
 extern struct saa7146_use_ops saa7146_video_uops;
 int saa7146_start_preview(struct saa7146_fh *fh);
 int saa7146_stop_preview(struct saa7146_fh *fh);