V4L/DVB (9753): em28xx: cleanup: saa7115 module auto-detects saa711x type

Since saa7115 has saa711x chip auto-detection, there's no need on differenciating
it at cards table. Just use the generic name for all boards that use a philips
saa711x decoder.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 11308eb..8b82c55 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -65,7 +65,7 @@ struct em28xx_board em28xx_boards[] = {
                .name         = "Unknown EM2800 video grabber",
                .is_em2800    = 1,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = SAA7115_COMPOSITE0,
@@ -95,7 +95,7 @@ struct em28xx_board em28xx_boards[] = {
                .name         = "Kworld PVR TV 2800 RF",
                .tuner_type   = TUNER_TEMIC_PAL,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = SAA7115_COMPOSITE0,
@@ -110,7 +110,7 @@ struct em28xx_board em28xx_boards[] = {
                .name         = "Terratec Cinergy 250 USB",
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -129,7 +129,7 @@ struct em28xx_board em28xx_boards[] = {
                .name         = "Pinnacle PCTV USB 2",
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -168,7 +168,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -188,7 +188,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -208,7 +208,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_PHILIPS_FM1216ME_MK3,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -228,7 +228,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_TNF_5335MF,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE1,
@@ -248,7 +248,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_PHILIPS_FM1216ME_MK3,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7114,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = 2,
@@ -266,7 +266,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2820_BOARD_PINNACLE_DVC_100] = {
                .name         = "Pinnacle Dazzle DVC 100",
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = SAA7115_COMPOSITE0,
@@ -291,7 +291,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,  /* unknown? */
                .tda9887_conf = TDA9887_PRESENT,        /* unknown? */
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -313,7 +313,7 @@ struct em28xx_board em28xx_boards[] = {
                .tda9887_conf = TDA9887_PRESENT |
                                TDA9887_PORT1_ACTIVE |
                                TDA9887_PORT2_ACTIVE,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -331,7 +331,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2821_BOARD_USBGEAR_VD204] = {
                .name         = "Usbgear VD204v9",
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type  = EM28XX_VMUX_COMPOSITE1,
                        .vmux  = SAA7115_COMPOSITE0,
@@ -355,7 +355,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2860_BOARD_TYPHOON_DVD_MAKER] = {
                .name         = "Typhoon DVD Maker",
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type  = EM28XX_VMUX_COMPOSITE1,
                        .vmux  = SAA7115_COMPOSITE0,
@@ -371,7 +371,7 @@ struct em28xx_board em28xx_boards[] = {
                .valid        = EM28XX_BOARD_NOT_VALIDATED,
                .tuner_type   = TUNER_TNF_5335MF,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -665,7 +665,7 @@ struct em28xx_board em28xx_boards[] = {
                                     TDA9887_PORT1_ACTIVE |
                                     TDA9887_PORT2_ACTIVE,
                .max_range_640_480 = 1,
-               .decoder           = EM28XX_SAA7114,
+               .decoder           = EM28XX_SAA711X,
                .input             = { {
                        .type      = EM28XX_VMUX_TELEVISION,
                        .vmux      = SAA7115_COMPOSITE4,
@@ -685,7 +685,7 @@ struct em28xx_board em28xx_boards[] = {
                .is_em2800    = 1,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -703,7 +703,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2800_BOARD_GRABBEEX_USB2800] = {
                .name         = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder",
                .is_em2800    = 1,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = SAA7115_COMPOSITE0,
@@ -719,7 +719,7 @@ struct em28xx_board em28xx_boards[] = {
                .is_em2800    = 1,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -739,7 +739,7 @@ struct em28xx_board em28xx_boards[] = {
                .is_em2800    = 1,
                .tuner_type   = TUNER_PHILIPS_FCV1236D,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -757,7 +757,7 @@ struct em28xx_board em28xx_boards[] = {
        [EM2820_BOARD_PINNACLE_DVC_90] = {
                .name         = "Pinnacle Dazzle DVC 90/DVC 100",
                .tuner_type   = TUNER_ABSENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_COMPOSITE1,
                        .vmux     = SAA7115_COMPOSITE0,
@@ -773,7 +773,7 @@ struct em28xx_board em28xx_boards[] = {
                .is_em2800    = 1,
                .tuner_type   = TUNER_LG_PAL_NEW_TAPC,
                .tda9887_conf = TDA9887_PRESENT,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -792,7 +792,7 @@ struct em28xx_board em28xx_boards[] = {
                .name         = "Pixelview Prolink PlayTV USB 2.0",
                .tda9887_conf = TDA9887_PRESENT,
                .tuner_type   = TUNER_YMEC_TVF_5533MF,
-               .decoder      = EM28XX_SAA7113,
+               .decoder      = EM28XX_SAA711X,
                .input        = { {
                        .type     = EM28XX_VMUX_TELEVISION,
                        .vmux     = SAA7115_COMPOSITE2,
@@ -814,7 +814,7 @@ struct em28xx_board em28xx_boards[] = {
                .has_snapshot_button = 1,
                .tda9887_conf        = TDA9887_PRESENT,
                .tuner_type          = TUNER_ABSENT,
-               .decoder             = EM28XX_SAA7113,
+               .decoder             = EM28XX_SAA711X,
                .input               = { {
                        .type     = EM28XX_VMUX_SVIDEO,
                        .vmux     = SAA7115_SVIDEO3,
@@ -1737,7 +1737,7 @@ void em28xx_card_setup(struct em28xx *dev)
        /* request some modules */
        if (dev->board.has_msp34xx)
                request_module("msp3400");
-       if (dev->board.decoder == EM28XX_SAA7113 || dev->board.decoder == EM28XX_SAA7114)
+       if (dev->board.decoder == EM28XX_SAA711X)
                request_module("saa7115");
        if (dev->board.decoder == EM28XX_TVP5150)
                request_module("tvp5150");

diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index e33aa54..a7cece9 100644 (file)
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -316,8 +316,7 @@ struct em28xx_input {
 enum em28xx_decoder {
        EM28XX_NODECODER,
        EM28XX_TVP5150,
-       EM28XX_SAA7113,
-       EM28XX_SAA7114
+       EM28XX_SAA711X,
 };
 
 struct em28xx_reg_seq {