aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx88/cx88-dvb.c
diff options
context:
space:
mode:
authorTrent Piepho <xyzzy@speakeasy.org>2007-03-09 13:07:07 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 14:44:55 -0400
commita5a2ecfc3b9b1f97a7f141bd95ea75097ad49b7c (patch)
treedc3817e4c652e26c89a5dc7f7359d487b6b80bc7 /drivers/media/video/cx88/cx88-dvb.c
parent59069e53a27605d14a1a693683a45de837ee7521 (diff)
V4L/DVB (5452): Cx88: merge identical boards
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/cx88/cx88-dvb.c')
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 07ec81f57cdd..dbfe4dc9cf8c 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -475,6 +475,8 @@ static int dvb_register(struct cx8802_dev *dev)
475 case CX88_BOARD_WINFAST_DTV2000H: 475 case CX88_BOARD_WINFAST_DTV2000H:
476 case CX88_BOARD_HAUPPAUGE_HVR1100: 476 case CX88_BOARD_HAUPPAUGE_HVR1100:
477 case CX88_BOARD_HAUPPAUGE_HVR1100LP: 477 case CX88_BOARD_HAUPPAUGE_HVR1100LP:
478 case CX88_BOARD_HAUPPAUGE_HVR1300:
479 case CX88_BOARD_HAUPPAUGE_HVR3000:
478 dev->dvb.frontend = dvb_attach(cx22702_attach, 480 dev->dvb.frontend = dvb_attach(cx22702_attach,
479 &hauppauge_hvr_config, 481 &hauppauge_hvr_config,
480 &dev->core->i2c_adap); 482 &dev->core->i2c_adap);
@@ -693,24 +695,6 @@ static int dvb_register(struct cx8802_dev *dev)
693 dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage; 695 dev->dvb.frontend->ops.set_voltage = geniatech_dvbs_set_voltage;
694 } 696 }
695 break; 697 break;
696 case CX88_BOARD_HAUPPAUGE_HVR1300:
697 dev->dvb.frontend = dvb_attach(cx22702_attach,
698 &hauppauge_hvr_config,
699 &dev->core->i2c_adap);
700 if (dev->dvb.frontend != NULL) {
701 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
702 &dev->core->i2c_adap, &dvb_pll_fmd1216me);
703 }
704 break;
705 case CX88_BOARD_HAUPPAUGE_HVR3000:
706 dev->dvb.frontend = dvb_attach(cx22702_attach,
707 &hauppauge_hvr_config,
708 &dev->core->i2c_adap);
709 if (dev->dvb.frontend != NULL) {
710 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
711 &dev->core->i2c_adap, &dvb_pll_fmd1216me);
712 }
713 break;
714 default: 698 default:
715 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n", 699 printk("%s: The frontend of your DVB/ATSC card isn't supported yet\n",
716 dev->core->name); 700 dev->core->name);