V4L/DVB (6157): Removed the need to manually define .bridge for each card

Moved the field from cx23885_board to cx23885_dev and added code to
iautomatically set the bridge type based on the pci device id.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 9344fb5d95f6..decf602ab164 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -32,7 +32,6 @@
 struct cx23885_board cx23885_boards[] = {
         [CX23885_BOARD_UNKNOWN] = {
                 .name           = "UNKNOWN/GENERIC",
-                .bridge         = CX23885_BRIDGE_UNDEFINED,
                 .input          = {{
                         .type   = CX23885_VMUX_COMPOSITE1,
                         .vmux   = 0,
@@ -49,7 +48,6 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1800lp] = {
                 .name           = "Hauppauge WinTV-HVR1800lp",
-                .bridge         = CX23885_BRIDGE_885,
                 .portc          = CX23885_MPEG_DVB,
                 .input          = {{
                         .type   = CX23885_VMUX_TELEVISION,
@@ -71,7 +69,6 @@ struct cx23885_board cx23885_boards[] = {
         },
         [CX23885_BOARD_HAUPPAUGE_HVR1800] = {
                 .name           = "Hauppauge WinTV-HVR1800",
-                .bridge         = CX23885_BRIDGE_887,
                 .portc          = CX23885_MPEG_DVB,
                 .input          = {{
                         .type   = CX23885_VMUX_TELEVISION,