diff options
| author | Trent Piepho <xyzzy@speakeasy.org> | 2007-03-09 10:07:07 -0800 |
|---|---|---|
| committer | Trent Piepho <xyzzy@speakeasy.org> | 2007-03-09 10:07:07 -0800 |
| commit | 6d4a3b8de8a3c9f1b5d470f8ff6fa30c59382cc6 (patch) | |
| tree | bab55c91bc90086d5cb0987fe73ffe025189217c /linux/drivers/media | |
| parent | 7b614fddb1b412f6ec17b91907a4473ed08e97de (diff) | |
| download | mediapointer-dvb-s2-6d4a3b8de8a3c9f1b5d470f8ff6fa30c59382cc6.tar.gz mediapointer-dvb-s2-6d4a3b8de8a3c9f1b5d470f8ff6fa30c59382cc6.tar.bz2 | |
cx88: merge identical boards
From: Trent Piepho <xyzzy@speakeasy.org>
The attach code for HAUPPAUGE_HVR3000 and HAUPPAUGE_HVR1300 is exactly
the same as the code used by HAUPPAUGE_HVR1100, HAUPPAUGE_HVR1100LP, and
WINFAST_DTV2000H. So, those first two cards are added to the case block
used by the last three.
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-dvb.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-dvb.c b/linux/drivers/media/video/cx88/cx88-dvb.c index 2b24c27a6..2327b32fd 100644 --- a/linux/drivers/media/video/cx88/cx88-dvb.c +++ b/linux/drivers/media/video/cx88/cx88-dvb.c @@ -476,6 +476,8 @@ static int dvb_register(struct cx8802_dev *dev) case CX88_BOARD_WINFAST_DTV2000H: case CX88_BOARD_HAUPPAUGE_HVR1100: case CX88_BOARD_HAUPPAUGE_HVR1100LP: + case CX88_BOARD_HAUPPAUGE_HVR1300: + case CX88_BOARD_HAUPPAUGE_HVR3000: dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_hvr_config, &dev->core->i2c_adap); @@ -694,24 +696,6 @@ static int dvb_register(struct cx8802_dev *dev) dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage; } break; - case CX88_BOARD_HAUPPAUGE_HVR1300: - dev->dvb.frontend = dvb_attach(cx22702_attach, - &hauppauge_hvr_config, - &dev->core->i2c_adap); - if (dev->dvb.frontend != NULL) { - dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, - &dev->core->i2c_adap, &dvb_pll_fmd1216me); - } - break; - case CX88_BOARD_HAUPPAUGE_HVR3000: - dev->dvb.frontend = dvb_attach(cx22702_attach, - &hauppauge_hvr_config, - &dev->core->i2c_adap); - if (dev->dvb.frontend != NULL) { - dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, - &dev->core->i2c_adap, &dvb_pll_fmd1216me); - } - break; default: printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", dev->core->name); |