3 files changed, 6 insertions, 14 deletions

diff --git a/drivers/media/dvb/frontends/dib3000.h b/drivers/media/dvb/frontends/dib3000.h
index 2d5475b5c063..ec927628d273 100644
--- a/drivers/media/dvb/frontends/dib3000.h
+++ b/drivers/media/dvb/frontends/dib3000.h
@@ -30,10 +30,6 @@ struct dib3000_config
 {
         /* the demodulator's i2c address */
         u8 demod_address;
-
-        /* PLL maintenance and the i2c address of the PLL */
-        int (*pll_init)(struct dvb_frontend *fe);
-        int (*pll_set)(struct dvb_frontend *fe, struct dvb_frontend_parameters* params);
 };
 
 struct dib_fe_xfer_ops
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index ae589adb1c0a..f2f8071ad1b0 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -60,8 +60,9 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
         fe_code_rate_t fe_cr = FEC_NONE;
         int search_state, seq;
 
-        if (tuner && state->config.pll_set) {
-                state->config.pll_set(fe, fep);
+        if (tuner && fe->ops->tuner_ops.set_params) {
+                fe->ops->tuner_ops.set_params(fe, fep);
+                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
 
                 deb_setf("bandwidth: ");
                 switch (ofdm->bandwidth) {
@@ -386,9 +387,6 @@ static int dib3000mb_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         wr(DIB3000MB_REG_DATA_IN_DIVERSITY, DIB3000MB_DATA_DIVERSITY_IN_OFF);
 
-        if (state->config.pll_init)
-                state->config.pll_init(fe);
-
         return 0;
 }
 
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index 3b303dbb6156..68a443b3d504 100644
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -462,8 +462,9 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe,
         int search_state,auto_val;
         u16 val;
 
-        if (tuner && state->config.pll_set) { /* initial call from dvb */
-                state->config.pll_set(fe,fep);
+        if (tuner && fe->ops->tuner_ops.set_params) { /* initial call from dvb */
+                fe->ops->tuner_ops.set_params(fe, fep);
+                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
 
                 state->last_tuned_freq = fep->frequency;
         //      if (!scanboost) {
@@ -642,9 +643,6 @@ static int dib3000mc_fe_init(struct dvb_frontend* fe, int mobile_mode)
 
         set_or(DIB3000MC_REG_CLK_CFG_7,DIB3000MC_CLK_CFG_7_DIV_IN_OFF);
 
-        if (state->config.pll_init)
-                state->config.pll_init(fe);
-
         deb_info("init end\n");
         return 0;
 }