V4L/DVB (7415): use tuner-simple for Philips TUV1236D digital tuning support

Convert cx88-dvb and saa7134-dvb to use tuner-simple instead of dvb-pll
for Philips TUV1236D

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 676cf7ce08f2b6613403fbdad30f96768e5ff5b7..8dca20b944dd7528cf6d9d9b51893f88686dd344 100644 (file)
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -731,8 +731,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                               &ati_hdtvwonder,
                                               &dev->core->i2c_adap);
                if (dev->dvb.frontend != NULL) {
-                       dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                  NULL, DVB_PLL_TUV1236D);
+                       dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                  &dev->core->i2c_adap, 0x61,
+                                  TUNER_PHILIPS_TUV1236D);
                }
                break;
        case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 16ea09a8728354df447a148c90fddee8a3c501bf..9f8730bc6e5fff3d07bf344d76ca956b0844aa74 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1085,8 +1085,9 @@ static int dvb_init(struct saa7134_dev *dev)
                dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110,
                                               &dev->i2c_adap);
                if (dev->dvb.frontend) {
-                       dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                  NULL, DVB_PLL_TUV1236D);
+                       dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                  &dev->i2c_adap, 0x61,
+                                  TUNER_PHILIPS_TUV1236D);
                }
                break;
        case SAA7134_BOARD_FLYDVBS_LR300: