openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] cx231xx: remove board specific initialization 

There is no need for a switch statement here.  Use the contents of the board
profile to dictate the tuner driver and i2c address.  Eventually if a board
ever comes around which has a different i2c bus than #1, well that should be a
field in the board profile as well.

Signed-off-by: Devin Heitmueller <dheitmueller@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Devin Heitmueller 2010-07-08 17:05:30 -03:00 committed by Mauro Carvalho Chehab
parent 99d35a0e4c
commit e3e0aaaafa
1 changed files with 9 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/media/video/cx231xx/cx231xx-cards.c
View File

@ -584,43 +584,18 @@ void cx231xx_card_setup(struct cx231xx *dev)
} }
switch (dev->model) { /* Initialize the tuner */
case CX231XX_BOARD_CNXT_CARRAERA: if (dev->board.tuner_type != TUNER_ABSENT) {
case CX231XX_BOARD_CNXT_RDE_250: dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
case CX231XX_BOARD_CNXT_SHELBY: &dev->i2c_bus[1].i2c_adap,
case CX231XX_BOARD_CNXT_RDU_250: "tuner", "tuner",
if (dev->board.tuner_type != TUNER_ABSENT) { dev->tuner_addr, NULL);
dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev, if (dev->sd_tuner == NULL)
&dev->i2c_bus[1].i2c_adap, cx231xx_info("tuner subdev registration failure\n");
"tuner", "tuner", 0xc2 >> 1, NULL); else
if (dev->sd_tuner == NULL)
cx231xx_info(
"tuner subdev registration failure\n");
cx231xx_config_tuner(dev); cx231xx_config_tuner(dev);
}
break;
case CX231XX_BOARD_CNXT_RDE_253S:
case CX231XX_BOARD_CNXT_RDU_253S:
case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
case CX231XX_BOARD_HAUPPAUGE_EXETER:
if (dev->board.tuner_type != TUNER_ABSENT) {
dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
&dev->i2c_bus[1].i2c_adap,
"tuner", "tuner", 0xc0 >> 1, NULL);
if (dev->sd_tuner == NULL)
cx231xx_info(
"tuner subdev registration failure\n");
cx231xx_config_tuner(dev);
}
break;
default:
break;
} }
cx231xx_config_tuner(dev);
#if 0 #if 0
/* TBD IR will be added later */ /* TBD IR will be added later */
cx231xx_ir_init(dev); cx231xx_ir_init(dev);