aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-12-04 23:01:39 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-12-10 06:22:53 -0500
commit1d4bb7d3c154167c8f0b80cfd72914d8732d3d01 (patch)
tree7019b5d07d5068fb3e89ffba8850118ee78840d0
parentc876a3468d0f136710af81595177889953d1ff71 (diff)
V4L/DVB (4943): Cx88: cleanup dvb_pll_attach for lgdt3302 tuners
Since we're using dvb_pll_attach now, we dont have to populate dev->core->pll_addr or dev->core->pll_desc anymore. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 95db017baddb..5f6d5491f5da 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -631,14 +631,13 @@ static int dvb_register(struct cx8802_dev *dev)
631 631
632 /* Select RF connector callback */ 632 /* Select RF connector callback */
633 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set; 633 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
634 dev->core->pll_addr = 0x61;
635 dev->core->pll_desc = &dvb_pll_microtune_4042;
636 dev->dvb.frontend = dvb_attach(lgdt330x_attach, 634 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
637 &fusionhdtv_3_gold, 635 &fusionhdtv_3_gold,
638 &dev->core->i2c_adap); 636 &dev->core->i2c_adap);
639 if (dev->dvb.frontend != NULL) { 637 if (dev->dvb.frontend != NULL) {
640 dvb_attach(dvb_pll_attach, dev->dvb.frontend, dev->core->pll_addr, 638 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
641 &dev->core->i2c_adap, dev->core->pll_desc); 639 &dev->core->i2c_adap,
640 &dvb_pll_microtune_4042);
642 } 641 }
643 } 642 }
644 break; 643 break;
@@ -652,14 +651,13 @@ static int dvb_register(struct cx8802_dev *dev)
652 mdelay(100); 651 mdelay(100);
653 cx_set(MO_GP0_IO, 9); 652 cx_set(MO_GP0_IO, 9);
654 mdelay(200); 653 mdelay(200);
655 dev->core->pll_addr = 0x61;
656 dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
657 dev->dvb.frontend = dvb_attach(lgdt330x_attach, 654 dev->dvb.frontend = dvb_attach(lgdt330x_attach,
658 &fusionhdtv_3_gold, 655 &fusionhdtv_3_gold,
659 &dev->core->i2c_adap); 656 &dev->core->i2c_adap);
660 if (dev->dvb.frontend != NULL) { 657 if (dev->dvb.frontend != NULL) {
661 dvb_attach(dvb_pll_attach, dev->dvb.frontend, dev->core->pll_addr, 658 dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
662 &dev->core->i2c_adap, dev->core->pll_desc); 659 &dev->core->i2c_adap,
660 &dvb_pll_thomson_dtt761x);
663 } 661 }
664 } 662 }
665 break; 663 break;