V4L/DVB (6659): Convert MTS to bitfield

Xc2028.3028 has two type of firmwares: audio-standard specific ones and
baseband MTS firmwares. MTS firmwares provide stereo decoding for 6 MHz
BTSC/EIAJ and for monoaural audio decoding on 8 MHz firmwares.

It seems that the option to use MTS or a standard-specific audio decoding
depends on the way xc2028/3028 is connected.

Instead of wasting 32 (or 64 bits) to signalize if the driver needs to use MTS
firmware, this patch converts it to a bitfield that can be shared with other
proprieties of xc2028/3028.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index c40b9d9b3070..29e935f41098 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -154,7 +154,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tda9887_conf = TDA9887_PRESENT,
                 .tuner_type   = TUNER_XC2028,
                 .has_tuner    = 1,
-                .xc2028_type  = XC2028_FIRM_MTS,
+                .mts_firmware = 1,
                 .decoder      = EM28XX_TVP5150,
                 .input          = {{
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -476,7 +476,7 @@ static void em28xx_config_tuner (struct em28xx *dev)
 
                 ctl.fname   = XC2028_DEFAULT_FIRMWARE;
                 ctl.max_len = 64;
-                ctl.type = em28xx_boards[dev->model].xc2028_type;
+                ctl.mts = em28xx_boards[dev->model].mts_firmware;
 
                 xc2028_cfg.tuner = TUNER_XC2028;
                 xc2028_cfg.priv  = &ctl;
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index db82b51c85ff..93007cc72f4d 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -176,9 +176,9 @@ struct em28xx_board {
 
         unsigned int has_tuner:1;
         unsigned int has_msp34xx:1;
+        unsigned int mts_firmware:1;
 
         enum em28xx_decoder decoder;
-        int xc2028_type;
 
         struct em28xx_input       input[MAX_EM28XX_INPUT];
 };