V4L/DVB (3851): Convert tda8083 to refactored tuner code
authorAndrew de Quincey <adq_dvb@lidskialf.net>
Tue, 18 Apr 2006 20:47:09 +0000 (17:47 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 25 Jun 2006 04:58:36 +0000 (01:58 -0300)
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>
drivers/media/dvb/frontends/tda8083.c
drivers/media/dvb/frontends/tda8083.h

index 91baa9cedd79846c90d58db1e4c12ee23551bb10..0aeaec890296847dd5907a52702fda977a5151bd 100644 (file)
@@ -293,7 +293,11 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
 {
        struct tda8083_state* state = fe->demodulator_priv;
 
-       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);
+       }
+
        tda8083_set_inversion (state, p->inversion);
        tda8083_set_fec (state, p->u.qpsk.fec_inner);
        tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate);
@@ -334,8 +338,6 @@ static int tda8083_init(struct dvb_frontend* fe)
        for (i=0; i<44; i++)
                tda8083_writereg (state, i, tda8083_init_tab[i]);
 
-       if (state->config->pll_init) state->config->pll_init(fe);
-
        tda8083_writereg (state, 0x00, 0x3c);
        tda8083_writereg (state, 0x00, 0x04);
 
index 466663307bf173693fb5cf94fd9269002a573455..e7a48f61ea2c6382e2e272f7f1b37f5e3c58d813 100644 (file)
@@ -33,10 +33,6 @@ struct tda8083_config
 {
        /* the demodulator's i2c address */
        u8 demod_address;
-
-       /* 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* tda8083_attach(const struct tda8083_config* config,