Skip to content

Commit

Permalink
V4L/DVB (3860): Convert l64871 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 a98af22 commit b800aae
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
7 changes: 4 additions & 3 deletions drivers/media/dvb/frontends/l64781.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa
u8 val0x06;
int bw = p->bandwidth - BANDWIDTH_8_MHZ;

state->config->pll_set(fe, param);
if (fe->ops->tuner_ops.set_params) {
fe->ops->tuner_ops.set_params(fe, param);
if (fe->ops->i2c_gate_ctrl) fe->ops->i2c_gate_ctrl(fe, 0);
}

if (param->inversion != INVERSION_ON &&
param->inversion != INVERSION_OFF)
Expand Down Expand Up @@ -463,8 +466,6 @@ static int l64781_init(struct dvb_frontend* fe)
/* Everything is two's complement, soft bit and CSI_OUT too */
l64781_writereg (state, 0x1e, 0x09);

if (state->config->pll_init) state->config->pll_init(fe);

/* delay a bit after first init attempt */
if (state->first) {
state->first = 0;
Expand Down
4 changes: 0 additions & 4 deletions drivers/media/dvb/frontends/l64781.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ struct l64781_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);
};


Expand Down

0 comments on commit b800aae

Please sign in to comment.