V4L/DVB (3862): Convert tda10021 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.
Add i2c gate control function.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 17 insertions, 10 deletions

diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index 21255cac9793..12e0ec27cb3c 100644
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -225,13 +225,6 @@ static int tda10021_init (struct dvb_frontend *fe)
 
         //Activate PLL
         tda10021_writereg(state, 0x2a, tda10021_inittab[0x2a] & 0xef);
-
-        if (state->config->pll_init) {
-                lock_tuner(state);
-                state->config->pll_init(fe);
-                unlock_tuner(state);
-        }
-
         return 0;
 }
 
@@ -259,9 +252,10 @@ static int tda10021_set_parameters (struct dvb_frontend *fe,
 
         //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate);
 
-        lock_tuner(state);
-        state->config->pll_set(fe, p);
-        unlock_tuner(state);
+        if (fe->ops->tuner_ops.set_params) {
+                fe->ops->tuner_ops.set_params(fe, p);
+                if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
+        }
 
         tda10021_set_symbolrate (state, p->u.qam.symbol_rate);
         tda10021_writereg (state, 0x34, state->pwm);
@@ -376,6 +370,18 @@ static int tda10021_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_pa
         return 0;
 }
 
+static int tda10021_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
+{
+        struct tda10021_state* state = fe->demodulator_priv;
+
+        if (enable) {
+                lock_tuner(state);
+        } else {
+                unlock_tuner(state);
+        }
+        return 0;
+}
+
 static int tda10021_sleep(struct dvb_frontend* fe)
 {
         struct tda10021_state* state = fe->demodulator_priv;
@@ -448,6 +454,7 @@ static struct dvb_frontend_ops tda10021_ops = {
 
         .init = tda10021_init,
         .sleep = tda10021_sleep,
+        .i2c_gate_ctrl = tda10021_i2c_gate_ctrl,
 
         .set_frontend = tda10021_set_parameters,
         .get_frontend = tda10021_get_frontend,