summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@hauppauge.com>2010-08-19 11:05:38 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-21 01:17:34 -0200
commitb6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b (patch)
treeec2950a612aaf200fcc0eac21e69c7fbfc77882b
parent8aed3f479bd25c8ba452c00585c8c261747f9143 (diff)
downloadblackbird-op-linux-b6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b.tar.gz
blackbird-op-linux-b6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b.zip
[media] cx231xx: remove board specific check for Colibri configuration
The cx231xx_set_Colibri_For_LowIF() function is only ever called if the tuner has a DIF (see vidioc_s_frequency() in cx231xx-video.c). Hence, we do not need to do a board specific check in this function. Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 7ba3449b87e4..a9e6cbe26ce5 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -1485,27 +1485,10 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq,
u32 colibri_carrier_offset = 0;
u8 status = 0;
- u32 func_mode = 0;
+ u32 func_mode = 0x01; /* Device has an DIF if this function is called */
u32 standard = 0;
u8 value[4] = { 0, 0, 0, 0 };
- switch (dev->model) {
- case CX231XX_BOARD_CNXT_CARRAERA:
- case CX231XX_BOARD_CNXT_RDE_250:
- case CX231XX_BOARD_CNXT_SHELBY:
- case CX231XX_BOARD_CNXT_RDU_250:
- case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
- func_mode = 0x03;
- break;
- case CX231XX_BOARD_CNXT_RDE_253S:
- case CX231XX_BOARD_CNXT_RDU_253S:
- func_mode = 0x01;
- break;
-
- default:
- func_mode = 0x01;
- }
-
cx231xx_info("Enter cx231xx_set_Colibri_For_LowIF()\n");
value[0] = (u8) 0x6F;
value[1] = (u8) 0x6F;
OpenPOWER on IntegriCloud