2 files changed, 0 insertions, 71 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 21ebe8f13815..3b653c924730 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -578,14 +578,9 @@ struct tvcard bttv_tvcards[] = {
                 .svhs           = 2,
                 .gpiomask       = 0x01fe00,
                 .muxsel         = { 2, 3, 1, 1 },
-        #if 0
-                /* old */
-                .gpiomux        = { 0x01c000, 0, 0x018000, 0x014000, 0x002000 },
-        #else
                 /* 2003-10-20 by "Anton A. Arapov" <arapov@mail.ru> */
                 .gpiomux        = { 0x001e00, 0, 0x018000, 0x014000 },
                 .gpiomute       = 0x002000,
-        #endif
                 .needs_tvaudio  = 1,
                 .pll            = PLL_28,
                 .tuner_type     = -1,
@@ -894,15 +889,10 @@ struct tvcard bttv_tvcards[] = {
                 .tuner          = 0,
                 .svhs           = 2,
                 .muxsel         = { 2, 3, 1, 1, 0 }, /* TV, CVid, SVid, CVid over SVid connector */
-        #if 0
-                .gpiomask       = 0xc33000,
-                .gpiomux        = { 0x422000,0x1000,0x0000,0x620000,0x800000 },
-        #else
                 /* Alexander Varakin <avarakin@hotmail.com> [stereo version] */
                 .gpiomask       = 0xb33000,
                 .gpiomux        = { 0x122000,0x1000,0x0000,0x620000 },
                 .gpiomute       = 0x800000,
-        #endif
                 /* Audio Routing for "WinFast 2000 XP" (no tv stereo !)
                         gpio23 -- hef4052:nEnable (0x800000)
                         gpio12 -- hef4052:A1
@@ -1937,11 +1927,6 @@ struct tvcard bttv_tvcards[] = {
                 .video_inputs   = 4,
                 .audio_inputs   = 1,
                 .tuner          = -1,
-        #if 0 /* TODO ... */
-                .svhs           = OSPREY540_SVID_ANALOG,
-                .muxsel         = {       [OSPREY540_COMP_ANALOG] = 2,
-                                        [OSPREY540_SVID_ANALOG] = 3, },
-        #endif
                 .pll            = PLL_28,
                 .tuner_type     = -1,
                 .tuner_addr     = ADDR_UNSET,
@@ -1949,10 +1934,6 @@ struct tvcard bttv_tvcards[] = {
                 .no_msp34xx     = 1,
                 .no_tda9875     = 1,
                 .no_tda7432     = 1,
-        #if 0 /* TODO ... */
-                .muxsel_hook    = osprey_540_muxsel,
-                .picture_hook   = osprey_540_set_picture,
-        #endif
         },
 
                 /* ---- card 0x5C ---------------------------------- */
@@ -2627,9 +2608,6 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
                 .has_radio      = 0,
-        #if 0
-                .has_remote     = 1,
-        #endif
         },
         [BTTV_BOARD_SUPER_TV] = {
                 /* Rick C <cryptdragoon@gmail.com> */
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 063df03dcf2e..97ef421dd093 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -797,55 +797,6 @@ void cx88_get_stereo(struct cx88_core *core, struct v4l2_tuner *t)
        Add some code here later.
 */
 
-# if 0
-        t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP |
-            V4L2_TUNER_CAP_LANG1 | V4L2_TUNER_CAP_LANG2;
-        t->rxsubchans = V4L2_TUNER_SUB_MONO;
-        t->audmode = V4L2_TUNER_MODE_MONO;
-
-        switch (core->tvaudio) {
-        case WW_BTSC:
-                t->capability = V4L2_TUNER_CAP_STEREO | V4L2_TUNER_CAP_SAP;
-                t->rxsubchans = V4L2_TUNER_SUB_STEREO;
-                if (1 == pilot) {
-                        /* SAP */
-                        t->rxsubchans |= V4L2_TUNER_SUB_SAP;
-                }
-                break;
-        case WW_A2_BG:
-        case WW_A2_DK:
-        case WW_A2_M:
-                if (1 == pilot) {
-                        /* stereo */
-                        t->rxsubchans =
-                            V4L2_TUNER_SUB_MONO | V4L2_TUNER_SUB_STEREO;
-                        if (0 == mode)
-                                t->audmode = V4L2_TUNER_MODE_STEREO;
-                }
-                if (2 == pilot) {
-                        /* dual language -- FIXME */
-                        t->rxsubchans =
-                            V4L2_TUNER_SUB_LANG1 | V4L2_TUNER_SUB_LANG2;
-                        t->audmode = V4L2_TUNER_MODE_LANG1;
-                }
-                break;
-        case WW_NICAM_BGDKL:
-                if (0 == mode) {
-                        t->audmode = V4L2_TUNER_MODE_STEREO;
-                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
-                }
-                break;
-        case WW_SYSTEM_L_AM:
-                if (0x0 == mode && !(cx_read(AUD_INIT) & 0x04)) {
-                        t->audmode = V4L2_TUNER_MODE_STEREO;
-                        t->rxsubchans |= V4L2_TUNER_SUB_STEREO;
-                }
-                break;
-        default:
-                /* nothing */
-                break;
-        }
-# endif
         return;
 }