[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>

diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c
index d95f3b256e30f8f1024e2e9ae8333a9769d76afc..efcbc3ed0aea0a3fe3a61232d0dd58345cfbd301 100644 (file)
--- a/drivers/media/common/tuners/tuner-xc2028.c
+++ b/drivers/media/common/tuners/tuner-xc2028.c
@@ -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.
         * 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});
 
                /* Analog modes require offset = 0 */
@@ -1054,7 +1054,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
                if (priv->ctrl.input1)
                        type |= INPUT1;
                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 */
@@ -1069,7 +1069,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
        p->std |= parse_audio_std_option();
 
        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,
@@ -1174,7 +1174,7 @@ static int xc2028_set_params(struct dvb_frontend *fe,
        }
 
        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)

diff --git a/drivers/staging/tm6000/tm6000-cards.c b/drivers/staging/tm6000/tm6000-cards.c
index 455038bdfc9f8d8ced98b36b4f2c3281527e57cd..22a222241cc43a7c5fa52939b79190716f81608f 100644 (file)
--- a/drivers/staging/tm6000/tm6000-cards.c
+++ b/drivers/staging/tm6000/tm6000-cards.c
@@ -588,8 +588,6 @@ static void tm6000_config_tuner(struct tm6000_core *dev)
        tun_setup.mode_mask = 0;
        if (dev->caps.has_tuner)
                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) {
        case TUNER_XC2028:

diff --git a/include/media/tuner.h b/include/media/tuner.h
index 32dfd5f33cd7272aa59d46a15c04da26803925ba..963e33471835d6360620d4714eaec7d8b54bf0ed 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -161,7 +161,7 @@
 enum tuner_mode {
        T_RADIO         = 1 << V4L2_TUNER_RADIO,
        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