V4L/DVB (10762): cx18: Get rid of unused variables related to video output

Remove variables that were holdovers from ivtv for supporting the CX23415
MPEG decoder output.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index fcc40bf37f2f59a1986c34eb644e7b5660dbd2aa..f3b0c946d45d98f899d83fe9e381a2d3cf5837d3 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -884,13 +884,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
 
        cx18_init_subdevs(cx);
 
-       if (cx->std & V4L2_STD_525_60) {
+       if (cx->std & V4L2_STD_525_60)
                cx->is_60hz = 1;
-               cx->is_out_60hz = 1;
-       } else {
+       else
                cx->is_50hz = 1;
-               cx->is_out_50hz = 1;
-       }
+
        cx->params.video_gop_size = cx->is_60hz ? 15 : 12;
 
        if (cx->options.radio > 0)

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 5e1ae91d5325cf4d0830d931d6077ef7654a9b29..ece4f281ef4254df1ec84b5bcc8676c316f84061 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -505,8 +505,6 @@ struct cx18 {
        const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */
        u8 is_50hz;
        u8 is_60hz;
-       u8 is_out_50hz; /* FIXME - remove, we don't have an output decoder */
-       u8 is_out_60hz; /* FIXME - remove, we don't have an output decoder */
        u8 nof_inputs;          /* number of video inputs */
        u8 nof_audio_inputs;    /* number of audio inputs */
        u16 buffer_id;          /* buffer ID counter */
@@ -591,7 +589,6 @@ struct cx18 {
        /* codec settings */
        u32 audio_input;
        u32 active_input;
-       u32 active_output;
        v4l2_std_id std;
        v4l2_std_id tuner_std;  /* The norm of the tuner (fixed) */
 };