Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 437f5fa34225db0d981536692678afc590e5c87f

Authored by Mauro Carvalho Chehab
1 parent 550df5a450
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[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: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 5 additions and 7 deletions Side-by-side Diff

drivers/media/common/tuners/tuner-xc2028.c
Diff comments   View file @ 437f5fa
... ... @@ -933,7 +933,7 @@
933 933 * that xc2028 will be in a safe state.
934 934 * Maybe this might also be needed for DTV.
935 935 */
936   - if (new_mode == T_ANALOG_TV) {
  936 + if (new_mode == V4L2_TUNER_ANALOG_TV) {
937 937 rc = send_seq(priv, {0x00, 0x00});
938 938  
939 939 /* Analog modes require offset = 0 */
... ... @@ -1054,7 +1054,7 @@
1054 1054 if (priv->ctrl.input1)
1055 1055 type |= INPUT1;
1056 1056 return generic_set_freq(fe, (625l * p->frequency) / 10,
1057   - T_RADIO, type, 0, 0);
  1057 + V4L2_TUNER_RADIO, type, 0, 0);
1058 1058 }
1059 1059  
1060 1060 /* if std is not defined, choose one */
... ... @@ -1069,7 +1069,7 @@
1069 1069 p->std |= parse_audio_std_option();
1070 1070  
1071 1071 return generic_set_freq(fe, 62500l * p->frequency,
1072   - T_ANALOG_TV, type, p->std, 0);
  1072 + V4L2_TUNER_ANALOG_TV, type, p->std, 0);
1073 1073 }
1074 1074  
1075 1075 static int xc2028_set_params(struct dvb_frontend *fe,
... ... @@ -1174,7 +1174,7 @@
1174 1174 }
1175 1175  
1176 1176 return generic_set_freq(fe, p->frequency,
1177   - T_DIGITAL_TV, type, 0, demod);
  1177 + V4L2_TUNER_DIGITAL_TV, type, 0, demod);
1178 1178 }
1179 1179  
1180 1180 static int xc2028_sleep(struct dvb_frontend *fe)
drivers/staging/tm6000/tm6000-cards.c
Diff comments   View file @ 437f5fa
... ... @@ -588,8 +588,6 @@
588 588 tun_setup.mode_mask = 0;
589 589 if (dev->caps.has_tuner)
590 590 tun_setup.mode_mask |= (T_ANALOG_TV | T_RADIO);
591   - if (dev->caps.has_dvb)
592   - tun_setup.mode_mask |= T_DIGITAL_TV;
593 591  
594 592 switch (dev->tuner_type) {
595 593 case TUNER_XC2028:
include/media/tuner.h
Diff comments   View file @ 437f5fa
... ... @@ -161,7 +161,7 @@
161 161 enum tuner_mode {
162 162 T_RADIO = 1 << V4L2_TUNER_RADIO,
163 163 T_ANALOG_TV = 1 << V4L2_TUNER_ANALOG_TV,
164   - T_DIGITAL_TV = 1 << V4L2_TUNER_DIGITAL_TV,
  164 + /* Don't need to map V4L2_TUNER_DIGITAL_TV, as tuner-core won't use it */
165 165 };
166 166  
167 167 /* Older boards only had a single tuner device. Nowadays multiple tuner