Commit 8d037ed1 authored by Andy Walls's avatar Andy Walls Committed by Mauro Carvalho Chehab

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: default avatarAndy Walls <awalls@radix.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 6246d4e1
...@@ -884,13 +884,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, ...@@ -884,13 +884,11 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
cx18_init_subdevs(cx); cx18_init_subdevs(cx);
if (cx->std & V4L2_STD_525_60) { if (cx->std & V4L2_STD_525_60)
cx->is_60hz = 1; cx->is_60hz = 1;
cx->is_out_60hz = 1; else
} else {
cx->is_50hz = 1; cx->is_50hz = 1;
cx->is_out_50hz = 1;
}
cx->params.video_gop_size = cx->is_60hz ? 15 : 12; cx->params.video_gop_size = cx->is_60hz ? 15 : 12;
if (cx->options.radio > 0) if (cx->options.radio > 0)
......
...@@ -505,8 +505,6 @@ struct cx18 { ...@@ -505,8 +505,6 @@ struct cx18 {
const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */ const struct cx18_card_tuner_i2c *card_i2c; /* i2c addresses to probe for tuner */
u8 is_50hz; u8 is_50hz;
u8 is_60hz; 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_inputs; /* number of video inputs */
u8 nof_audio_inputs; /* number of audio inputs */ u8 nof_audio_inputs; /* number of audio inputs */
u16 buffer_id; /* buffer ID counter */ u16 buffer_id; /* buffer ID counter */
...@@ -591,7 +589,6 @@ struct cx18 { ...@@ -591,7 +589,6 @@ struct cx18 {
/* codec settings */ /* codec settings */
u32 audio_input; u32 audio_input;
u32 active_input; u32 active_input;
u32 active_output;
v4l2_std_id std; v4l2_std_id std;
v4l2_std_id tuner_std; /* The norm of the tuner (fixed) */ v4l2_std_id tuner_std; /* The norm of the tuner (fixed) */
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment