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, 6 insertions, 5 deletions

diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 04105bcf53f3..4e1fc68d4206 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -101,11 +101,6 @@ struct cx23885_board {
                 CX23885_MPEG_UNDEFINED = 0,
                 CX23885_MPEG_DVB
         } portc;
-        enum {
-                CX23885_BRIDGE_UNDEFINED = 0,
-                CX23885_BRIDGE_885 = 885,
-                CX23885_BRIDGE_887 = 887,
-        } bridge;
         struct cx23885_input    input[MAX_CX23885_INPUT];
 };
 
@@ -210,6 +205,12 @@ struct cx23885_dev {
 
         /* sram configuration */
         struct sram_channel        *sram_channels;
+
+        enum {
+                CX23885_BRIDGE_UNDEFINED = 0,
+                CX23885_BRIDGE_885 = 885,
+                CX23885_BRIDGE_887 = 887,
+        } bridge;
 };
 
 #define SRAM_CH01  0 /* Video A */