3 files changed, 16 insertions, 10 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 8b4243a1fca8..b75b2b7a1330 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -453,8 +453,9 @@ static struct mt352_config cxusb_mt352_xc3028_config = {
 /* Callbacks for DVB USB */
 static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
-                   DVB_PLL_FMD1216ME);
+        dvb_attach(simple_tuner_attach, adap->fe,
+                   &adap->dev->i2c_adap, 0x61,
+                   TUNER_PHILIPS_FMD1216ME_MK3);
         return 0;
 }
 
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index 0b19384c72f1..676cf7ce08f2 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -525,8 +525,9 @@ static int dvb_register(struct cx8802_dev *dev)
                                                &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);
+                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &dev->core->i2c_adap, 0x61,
+                                   TUNER_PHILIPS_FMD1216ME_MK3);
                 }
                 break;
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
@@ -593,8 +594,9 @@ static int dvb_register(struct cx8802_dev *dev)
                 dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
                                                &dev->vp3054->adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
-                                   &dev->core->i2c_adap, DVB_PLL_FMD1216ME);
+                        dvb_attach(simple_tuner_attach, dev->dvb.frontend,
+                                   &dev->core->i2c_adap, 0x61,
+                                   TUNER_PHILIPS_FMD1216ME_MK3);
                 }
 #else
                 printk(KERN_ERR "%s/2: built without vp3054 support\n", dev->core->name);
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: