Skip to content

Commit

Permalink
V4L/DVB (3851): Convert tda8083 to refactored tuner code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Andrew de Quincey authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 58ac7d3 commit d21eac0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
8 changes: 5 additions & 3 deletions drivers/media/dvb/frontends/tda8083.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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);

Expand Down
4 changes: 0 additions & 4 deletions drivers/media/dvb/frontends/tda8083.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d21eac0

Please sign in to comment.