V4L/DVB (7413): use tuner-simple for Philips FMD1216ME digital tuning support

Convert cxusb, cx88-dvb and saa7134-dvb to use tuner-simple instead of
dvb-pll for Philips FMD1216ME

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

1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index e26c3bc2d210..5b65aa255bb1 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -47,6 +47,7 @@
 #include "isl6421.h"
 #include "isl6405.h"
 #include "lnbp21.h"
+#include "tuner-simple.h"
 
 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
 MODULE_LICENSE("GPL");
@@ -938,8 +939,9 @@ static int dvb_init(struct saa7134_dev *dev)
                                                &medion_cardbus,
                                                &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
-                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
+                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &dev->i2c_adap, medion_cardbus.tuner_address,
+                                   TUNER_PHILIPS_FMD1216ME_MK3);
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
@@ -1108,8 +1110,9 @@ static int dvb_init(struct saa7134_dev *dev)
                         dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
                         dev->dvb.frontend->ops.sleep = philips_europa_demod_sleep;
 
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, medion_cardbus.tuner_address,
-                                   &dev->i2c_adap, DVB_PLL_FMD1216ME);
+                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &dev->i2c_adap, medion_cardbus.tuner_address,
+                                   TUNER_PHILIPS_FMD1216ME_MK3);
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200A: