V4L/DVB (10861): vino/indycam/saa7191: convert to i2c modules to V4L2.

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

1 files changed, 8 insertions, 18 deletions

diff --git a/drivers/media/video/saa7191.h b/drivers/media/video/saa7191.h
index a2310da1940d..803c74d6066f 100644
--- a/drivers/media/video/saa7191.h
+++ b/drivers/media/video/saa7191.h
@@ -176,11 +176,9 @@
 #define SAA7191_INPUT_COMPOSITE 0
 #define SAA7191_INPUT_SVIDEO    1
 
-#define SAA7191_NORM_AUTO       0
 #define SAA7191_NORM_PAL        1
 #define SAA7191_NORM_NTSC       2
 #define SAA7191_NORM_SECAM      3
-#define SAA7191_NORM_AUTO_EXT   4       /* extended auto-detection */
 
 struct saa7191_status {
         /* 0=no signal, 1=signal detected */
@@ -232,24 +230,16 @@ struct saa7191_status {
 #define SAA7191_VNR_MAX                 0x03
 #define SAA7191_VNR_DEFAULT             0x00
 
-#define SAA7191_CONTROL_BANDPASS        0
-#define SAA7191_CONTROL_BANDPASS_WEIGHT 1
-#define SAA7191_CONTROL_CORING          2
-#define SAA7191_CONTROL_FORCE_COLOUR    3       /* boolean */
-#define SAA7191_CONTROL_CHROMA_GAIN     4
-#define SAA7191_CONTROL_HUE             5
-#define SAA7191_CONTROL_VTRC            6       /* boolean */
-#define SAA7191_CONTROL_LUMA_DELAY      7
-#define SAA7191_CONTROL_VNR             8
-
-struct saa7191_control {
-        u8 type;
-        s32 value;
-};
+#define SAA7191_CONTROL_BANDPASS        (V4L2_CID_PRIVATE_BASE + 0)
+#define SAA7191_CONTROL_BANDPASS_WEIGHT (V4L2_CID_PRIVATE_BASE + 1)
+#define SAA7191_CONTROL_CORING          (V4L2_CID_PRIVATE_BASE + 2)
+#define SAA7191_CONTROL_FORCE_COLOUR    (V4L2_CID_PRIVATE_BASE + 3)
+#define SAA7191_CONTROL_CHROMA_GAIN     (V4L2_CID_PRIVATE_BASE + 4)
+#define SAA7191_CONTROL_VTRC            (V4L2_CID_PRIVATE_BASE + 5)
+#define SAA7191_CONTROL_LUMA_DELAY      (V4L2_CID_PRIVATE_BASE + 6)
+#define SAA7191_CONTROL_VNR             (V4L2_CID_PRIVATE_BASE + 7)
 
 #define DECODER_SAA7191_GET_STATUS      _IOR('d', 195, struct saa7191_status)
 #define DECODER_SAA7191_SET_NORM        _IOW('d', 196, int)
-#define DECODER_SAA7191_GET_CONTROL     _IOR('d', 197, struct saa7191_control)
-#define DECODER_SAA7191_SET_CONTROL     _IOW('d', 198, struct saa7191_control)
 
 #endif