diff options
| author | Devin Heitmueller <dheitmueller@hauppauge.com> | 2010-07-08 17:05:30 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-21 01:17:19 -0200 |
| commit | e3e0aaaafae24658f3d8683c65bc6793adbdfeb8 (patch) | |
| tree | 695771abc72977f1755f122f5ce9971cbdd9a26b /drivers | |
| parent | 99d35a0e4c5f90fedd08b378be880308e3ef8cb3 (diff) | |
| download | linux-e3e0aaaafae24658f3d8683c65bc6793adbdfeb8.tar.gz linux-e3e0aaaafae24658f3d8683c65bc6793adbdfeb8.tar.bz2 linux-e3e0aaaafae24658f3d8683c65bc6793adbdfeb8.zip | |
[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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/cx231xx/cx231xx-cards.c | 43 |
1 files changed, 9 insertions, 34 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index e8d5f70a5116..4e63c194df01 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c @@ -584,43 +584,18 @@ void cx231xx_card_setup(struct cx231xx *dev) } - 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: - 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", 0xc2 >> 1, NULL); - if (dev->sd_tuner == NULL) - cx231xx_info( - "tuner subdev registration failure\n"); - - 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"); - + /* Initialize the tuner */ + 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", + dev->tuner_addr, NULL); + if (dev->sd_tuner == NULL) + cx231xx_info("tuner subdev registration failure\n"); + else cx231xx_config_tuner(dev); - } - break; - default: - break; } - cx231xx_config_tuner(dev); - #if 0 /* TBD IR will be added later */ cx231xx_ir_init(dev); |