diff options
-rw-r--r-- | drivers/media/dvb/frontends/tda8083.c | 8 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/tda8083.h | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c index 91baa9cedd79..0aeaec890296 100644 --- a/drivers/media/dvb/frontends/tda8083.c +++ b/drivers/media/dvb/frontends/tda8083.c | |||
@@ -293,7 +293,11 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
293 | { | 293 | { |
294 | struct tda8083_state* state = fe->demodulator_priv; | 294 | struct tda8083_state* state = fe->demodulator_priv; |
295 | 295 | ||
296 | state->config->pll_set(fe, p); | 296 | if (fe->ops->tuner_ops.set_params) { |
297 | fe->ops->tuner_ops.set_params(fe, p); | ||
298 | if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0); | ||
299 | } | ||
300 | |||
297 | tda8083_set_inversion (state, p->inversion); | 301 | tda8083_set_inversion (state, p->inversion); |
298 | tda8083_set_fec (state, p->u.qpsk.fec_inner); | 302 | tda8083_set_fec (state, p->u.qpsk.fec_inner); |
299 | tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate); | 303 | tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate); |
@@ -334,8 +338,6 @@ static int tda8083_init(struct dvb_frontend* fe) | |||
334 | for (i=0; i<44; i++) | 338 | for (i=0; i<44; i++) |
335 | tda8083_writereg (state, i, tda8083_init_tab[i]); | 339 | tda8083_writereg (state, i, tda8083_init_tab[i]); |
336 | 340 | ||
337 | if (state->config->pll_init) state->config->pll_init(fe); | ||
338 | |||
339 | tda8083_writereg (state, 0x00, 0x3c); | 341 | tda8083_writereg (state, 0x00, 0x3c); |
340 | tda8083_writereg (state, 0x00, 0x04); | 342 | tda8083_writereg (state, 0x00, 0x04); |
341 | 343 | ||
diff --git a/drivers/media/dvb/frontends/tda8083.h b/drivers/media/dvb/frontends/tda8083.h index 466663307bf1..e7a48f61ea2c 100644 --- a/drivers/media/dvb/frontends/tda8083.h +++ b/drivers/media/dvb/frontends/tda8083.h | |||
@@ -33,10 +33,6 @@ struct tda8083_config | |||
33 | { | 33 | { |
34 | /* the demodulator's i2c address */ | 34 | /* the demodulator's i2c address */ |
35 | u8 demod_address; | 35 | u8 demod_address; |
36 | |||
37 | /* PLL maintenance */ | ||
38 | int (*pll_init)(struct dvb_frontend* fe); | ||
39 | int (*pll_set)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params); | ||
40 | }; | 36 | }; |
41 | 37 | ||
42 | extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, | 38 | extern struct dvb_frontend* tda8083_attach(const struct tda8083_config* config, |