V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device

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

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 1321ad5d6597..4bdeb03f1644 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -31,7 +31,7 @@
 #define _MEYE_PRIV_H_
 
 #define MEYE_DRIVER_MAJORVERSION         1
-#define MEYE_DRIVER_MINORVERSION        13
+#define MEYE_DRIVER_MINORVERSION        14
 
 #define MEYE_DRIVER_VERSION __stringify(MEYE_DRIVER_MAJORVERSION) "." \
                             __stringify(MEYE_DRIVER_MINORVERSION)
@@ -289,6 +289,7 @@ struct meye_grab_buffer {
 
 /* Motion Eye device structure */
 struct meye {
+        struct v4l2_device v4l2_dev;    /* Main v4l2_device struct */
         struct pci_dev *mchip_dev;      /* pci device */
         u8 mchip_irq;                   /* irq */
         u8 mchip_mode;                  /* actual mchip mode: HIC_MODE... */
@@ -308,8 +309,11 @@ struct meye {
         struct kfifo doneq;             /* queue for grabbed buffers */
         spinlock_t doneq_lock;          /* lock protecting the queue */
         wait_queue_head_t proc_list;    /* wait queue */
-        struct video_device *video_dev; /* video device parameters */
-        struct video_picture picture;   /* video picture parameters */
+        struct video_device *vdev;      /* video device parameters */
+        u16 brightness;
+        u16 hue;
+        u16 contrast;
+        u16 colour;
         struct meye_params params;      /* additional parameters */
         unsigned long in_use;           /* set to 1 if the device is in use */
 #ifdef CONFIG_PM