V4L/DVB (3919): V4l: rename TUNER_LG_TDVS_H062F to TUNER_LG_TDVS_H06XF

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

5 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 1a56846c1d..e358e91143 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2745,7 +2745,7 @@ struct tvcard bttv_tvcards[] = {
                 /* Michael Krufky <mkrufky@m1k.net> */
                 .name           = "DViCO FusionHDTV 5 Lite",
                 .tuner          = 0,
-                .tuner_type     = TUNER_LG_TDVS_H062F,
+                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .video_inputs   = 3,
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 9516c40811..645464b2d2 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -759,7 +759,7 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_5_GOLD] = {
                 .name           = "DViCO FusionHDTV 5 Gold",
-                .tuner_type     = TUNER_LG_TDVS_H062F,
+                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H062F */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1096,7 +1096,7 @@ struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_PCHDTV_HD5500] = {
                 .name           = "pcHDTV HD5500 HDTV",
-                .tuner_type     = TUNER_LG_TDVS_H062F,
+                .tuner_type     = TUNER_LG_TDVS_H06XF, /* TDVS-H064F */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 1013b4de89..cc4a38b345 100644
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -199,7 +199,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
                 i2c_master_send(c, buffer, 4);
                 default_tuner_init(c);
                 break;
-        case TUNER_LG_TDVS_H062F:
+        case TUNER_LG_TDVS_H06XF:
                 /* Set the Auxiliary Byte. */
                 buffer[2] &= ~0x20;
                 buffer[2] |= 0x18;
diff --git a/drivers/media/video/tuner-types.c b/drivers/media/video/tuner-types.c
index 4b77d21067..58cae66429 100644
--- a/drivers/media/video/tuner-types.c
+++ b/drivers/media/video/tuner-types.c
@@ -874,7 +874,7 @@ static struct tuner_params tuner_philips_fmd1216me_mk3_params[] = {
 };
 
 
-/* ------------ TUNER_LG_TDVS_H062F - INFINEON ATSC ------------ */
+/* ------ TUNER_LG_TDVS_H06XF - LG INNOTEK / INFINEON ATSC ----- */
 
 static struct tuner_range tuner_tua6034_ntsc_ranges[] = {
         { 16 * 165.00 /*MHz*/, 0x8e, 0x01 },
@@ -883,7 +883,7 @@ static struct tuner_range tuner_tua6034_ntsc_ranges[] = {
 };
 
 
-static struct tuner_params tuner_tua6034_params[] = {
+static struct tuner_params tuner_lg_tdvs_h06xf_params[] = {
         {
                 .type   = TUNER_PARAM_TYPE_NTSC,
                 .ranges = tuner_tua6034_ntsc_ranges,
@@ -1370,10 +1370,10 @@ struct tunertype tuners[] = {
                 .params = tuner_philips_fmd1216me_mk3_params,
                 .count  = ARRAY_SIZE(tuner_philips_fmd1216me_mk3_params),
         },
-        [TUNER_LG_TDVS_H062F] = { /* LGINNOTEK ATSC */
+        [TUNER_LG_TDVS_H06XF] = { /* LGINNOTEK ATSC */
                 .name   = "LG TDVS-H06xF", /* H061F, H062F & H064F */
-                .params = tuner_tua6034_params,
-                .count  = ARRAY_SIZE(tuner_tua6034_params),
+                .params = tuner_lg_tdvs_h06xf_params,
+                .count  = ARRAY_SIZE(tuner_lg_tdvs_h06xf_params),
         },
         [TUNER_YMEC_TVF66T5_B_DFF] = { /* Philips PAL */
                 .name   = "Ymec TVF66T5-B/DFF",
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 0f4f2de650..1601014c3f 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -108,7 +108,7 @@
 #define TUNER_TEA5767                   62      /* Only FM Radio Tuner */
 #define TUNER_PHILIPS_FMD1216ME_MK3     63
 
-#define TUNER_LG_TDVS_H062F             64      /* DViCO FusionHDTV 5 */
+#define TUNER_LG_TDVS_H06XF             64      /* TDVS H061F, H062F, H064F */
 #define TUNER_YMEC_TVF66T5_B_DFF        65      /* Acorp Y878F */
 #define TUNER_LG_TALN                   66
 #define TUNER_PHILIPS_TD1316            67