Skip to content

Commit

Permalink
V4L/DVB (3853): Convert ves1820 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 d21eac0 commit 58b119e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
9 changes: 5 additions & 4 deletions drivers/media/dvb/frontends/ves1820.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand All @@ -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);

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

0 comments on commit 58b119e

Please sign in to comment.