6 files changed, 23 insertions, 32 deletions

diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index b5acb11c0bc..36e0f8fee37 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -118,7 +118,8 @@ static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_f
 {
         struct dvb_usb_adapter *adap = fe->dvb->priv;
         u8 b[5];
-        dvb_usb_tuner_calc_regs(fe,fep,b, 5);
+
+        fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
         if (fe->ops.i2c_gate_ctrl)
                 fe->ops.i2c_gate_ctrl(fe, 1);
         return digitv_ctrl_msg(adap->dev, USB_WRITE_TUNER, 0, &b[1], 4, NULL, 0);
@@ -130,12 +131,14 @@ static struct nxt6000_config digitv_nxt6000_config = {
 
 static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 {
+        struct digitv_state *st = adap->dev->priv;
+
         if ((adap->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
+                st->is_nxt6000 = 0;
                 return 0;
         }
         if ((adap->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &adap->dev->i2c_adap)) != NULL) {
-                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+                st->is_nxt6000 = 1;
                 return 0;
         }
         return -EIO;
@@ -143,8 +146,14 @@ static int digitv_frontend_attach(struct dvb_usb_adapter *adap)
 
 static int digitv_tuner_attach(struct dvb_usb_adapter *adap)
 {
-        adap->pll_addr = 0x60;
-        adap->pll_desc = &dvb_pll_tded4;
+        struct digitv_state *st = adap->dev->priv;
+
+        if (!dvb_attach(dvb_pll_attach, adap->fe, 0x60, NULL, &dvb_pll_tded4))
+                return -ENODEV;
+
+        if (st->is_nxt6000)
+                adap->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
+
         return 0;
 }
 
@@ -273,6 +282,8 @@ static struct dvb_usb_device_properties digitv_properties = {
         .usb_ctrl = CYPRESS_FX2,
         .firmware = "dvb-usb-digitv-02.fw",
 
+        .size_of_priv = sizeof(struct digitv_state),
+
         .num_adapters = 1,
         .adapter = {
                 {
diff --git a/drivers/media/dvb/dvb-usb/digitv.h b/drivers/media/dvb/dvb-usb/digitv.h
index 477ee428a70..8b43e3db869 100644
--- a/drivers/media/dvb/dvb-usb/digitv.h
+++ b/drivers/media/dvb/dvb-usb/digitv.h
@@ -4,6 +4,10 @@
 #define DVB_USB_LOG_PREFIX "digitv"
 #include "dvb-usb.h"
 
+struct digitv_state {
+    int is_nxt6000;
+};
+
 extern int dvb_usb_digitv_debug;
 #define deb_rc(args...)   dprintk(dvb_usb_digitv_debug,0x01,args)
 
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 4c80823d8d0..5792951b990 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -78,26 +78,6 @@ int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
 }
 EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);
 
-int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len)
-{
-        struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-        if (buf_len != 5)
-                return -EINVAL;
-        if (adap->pll_desc == NULL)
-                return 0;
-
-        deb_pll("pll addr: %x, freq: %d %p\n",adap->pll_addr, fep->frequency, adap->pll_desc);
-
-        b[0] = adap->pll_addr;
-        dvb_pll_configure(adap->pll_desc, &b[1], fep);
-
-        deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);
-
-        return 5;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_calc_regs);
-
 int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
 {
         struct dvb_usb_adapter *adap = fe->dvb->priv;
@@ -105,7 +85,7 @@ int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_pa
         u8 b[5];
         struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
 
-        dvb_usb_tuner_calc_regs(fe,fep,b,5);
+        fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
 
         if (adap->tuner_pass_ctrl)
                 adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 6f824a569e1..d008a24c247 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -390,7 +390,6 @@ extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int
 
 /* commonly used pll init and set functions */
 extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);
-extern int dvb_usb_tuner_calc_regs(struct dvb_frontend *, struct dvb_frontend_parameters *, u8 *buf, int buf_len);
 extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
 
 /* commonly used firmware download types and function */
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index 9fb4decebd9..5c26fa11298 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -522,8 +522,8 @@ static int debug = 0;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable verbose debug messages");
 
-int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
-                      const struct dvb_frontend_parameters *params)
+static int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
+                             const struct dvb_frontend_parameters *params)
 {
         u32 div;
         int i;
diff --git a/drivers/media/dvb/frontends/dvb-pll.h b/drivers/media/dvb/frontends/dvb-pll.h
index 83f1279da77..a88ec86bd3b 100644
--- a/drivers/media/dvb/frontends/dvb-pll.h
+++ b/drivers/media/dvb/frontends/dvb-pll.h
@@ -50,9 +50,6 @@ extern struct dvb_pll_desc dvb_pll_philips_td1316;
 extern struct dvb_pll_desc dvb_pll_thomson_fe6600;
 extern struct dvb_pll_desc dvb_pll_opera1;
 
-extern int dvb_pll_configure(struct dvb_pll_desc *desc, u8 *buf,
-                             const struct dvb_frontend_parameters *params);
-
 /**
  * Attach a dvb-pll to the supplied frontend structure.
  *