From: Devin Heitmueller Date: Thu, 19 Aug 2010 14:05:38 +0000 (-0300) Subject: [media] cx231xx: remove board specific check for Colibri configuration X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b6cd9c4a1de9baa1a2dcd5349a8631c86a0cb61b;p=linux-beck.git [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 Signed-off-by: Mauro Carvalho Chehab --- 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;