V4L/DVB (3853): Convert ves1820 to refactored tuner code

Convert to tuner_ops calls.
Remove pll function pointers from structure.
Remove unneeded tuner calls.

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

diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index ad8647a3c85e69c6caa321e2d2a334afa6e54526..9810e2dcbbecdcd13e6d240c12f83c0e4f723e33 100644 (file)
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -204,9 +204,6 @@ static int ves1820_init(struct dvb_frontend* fe)
 
        ves1820_writereg(state, 0x34, state->pwm);
 
-       if (state->config->pll_init)
-               state->config->pll_init(fe);
-
        return 0;
 }
 
@@ -223,7 +220,11 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p
        if (real_qam < 0 || real_qam > 4)
                return -EINVAL;
 
-       state->config->pll_set(fe, p);
+       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);
+       }
+
        ves1820_set_symbolrate(state, p->u.qam.symbol_rate);
        ves1820_writereg(state, 0x34, state->pwm);
 

diff --git a/drivers/media/dvb/frontends/ves1820.h b/drivers/media/dvb/frontends/ves1820.h
index 355f130b1be8e13f35454c81c7c7ad459253b998..520f09522fbbd0bc7604738ea61c366801aef75c 100644 (file)
--- a/drivers/media/dvb/frontends/ves1820.h
+++ b/drivers/media/dvb/frontends/ves1820.h
@@ -39,10 +39,6 @@ struct ves1820_config
 
        /* SELAGC control */
        u8 selagc:1;
-
-       /* PLL maintenance */
-       int (*pll_init)(struct dvb_frontend* fe);
-       int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params);
 };
 
 extern struct dvb_frontend* ves1820_attach(const struct ves1820_config* config,