提交 437f5fa3 编写于 作者: M Mauro Carvalho Chehab

[media] tuner: Remove remaining usages of T_DIGITAL_TV

A few places used T_DIGITAL_TV internally. Remove the usage of this
obsolete mode mask.
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 550df5a4
...@@ -933,7 +933,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */, ...@@ -933,7 +933,7 @@ static int generic_set_freq(struct dvb_frontend *fe, u32 freq /* in HZ */,
* that xc2028 will be in a safe state. * that xc2028 will be in a safe state.
* Maybe this might also be needed for DTV. * Maybe this might also be needed for DTV.
*/ */
if (new_mode == T_ANALOG_TV) { if (new_mode == V4L2_TUNER_ANALOG_TV) {
rc = send_seq(priv, {0x00, 0x00}); rc = send_seq(priv, {0x00, 0x00});
/* Analog modes require offset = 0 */ /* Analog modes require offset = 0 */
...@@ -1054,7 +1054,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe, ...@@ -1054,7 +1054,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
if (priv->ctrl.input1) if (priv->ctrl.input1)
type |= INPUT1; type |= INPUT1;
return generic_set_freq(fe, (625l * p->frequency) / 10, return generic_set_freq(fe, (625l * p->frequency) / 10,
T_RADIO, type, 0, 0); V4L2_TUNER_RADIO, type, 0, 0);
} }
/* if std is not defined, choose one */ /* if std is not defined, choose one */
...@@ -1069,7 +1069,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe, ...@@ -1069,7 +1069,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
p->std |= parse_audio_std_option(); p->std |= parse_audio_std_option();
return generic_set_freq(fe, 62500l * p->frequency, return generic_set_freq(fe, 62500l * p->frequency,
T_ANALOG_TV, type, p->std, 0); V4L2_TUNER_ANALOG_TV, type, p->std, 0);
} }
static int xc2028_set_params(struct dvb_frontend *fe, static int xc2028_set_params(struct dvb_frontend *fe,
...@@ -1174,7 +1174,7 @@ static int xc2028_set_params(struct dvb_frontend *fe, ...@@ -1174,7 +1174,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
} }
return generic_set_freq(fe, p->frequency, return generic_set_freq(fe, p->frequency,
T_DIGITAL_TV, type, 0, demod); V4L2_TUNER_DIGITAL_TV, type, 0, demod);
} }
static int xc2028_sleep(struct dvb_frontend *fe) static int xc2028_sleep(struct dvb_frontend *fe)
......
...@@ -588,8 +588,6 @@ static void tm6000_config_tuner(struct tm6000_core *dev) ...@@ -588,8 +588,6 @@ static void tm6000_config_tuner(struct tm6000_core *dev)
tun_setup.mode_mask = 0; tun_setup.mode_mask = 0;
if (dev->caps.has_tuner) if (dev->caps.has_tuner)
tun_setup.mode_mask |= (T_ANALOG_TV | T_RADIO); tun_setup.mode_mask |= (T_ANALOG_TV | T_RADIO);
if (dev->caps.has_dvb)
tun_setup.mode_mask |= T_DIGITAL_TV;
switch (dev->tuner_type) { switch (dev->tuner_type) {
case TUNER_XC2028: case TUNER_XC2028:
......
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
enum tuner_mode { enum tuner_mode {
T_RADIO = 1 << V4L2_TUNER_RADIO, T_RADIO = 1 << V4L2_TUNER_RADIO,
T_ANALOG_TV = 1 << V4L2_TUNER_ANALOG_TV, T_ANALOG_TV = 1 << V4L2_TUNER_ANALOG_TV,
T_DIGITAL_TV = 1 << V4L2_TUNER_DIGITAL_TV, /* Don't need to map V4L2_TUNER_DIGITAL_TV, as tuner-core won't use it */
}; };
/* Older boards only had a single tuner device. Nowadays multiple tuner /* Older boards only had a single tuner device. Nowadays multiple tuner
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册