Skip to content

Commit

Permalink
V4L/DVB (3865): Convert or51132 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 dvb-pll code - done elsewhere now.

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 089e980 commit 44d92aa
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
12 changes: 4 additions & 8 deletions drivers/media/dvb/frontends/or51132.c
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
struct dvb_frontend_parameters *param)
{
int ret;
u8 buf[4];
struct or51132_state* state = fe->demodulator_priv;
const struct firmware *fw;
const char *fwname;
Expand Down Expand Up @@ -384,13 +383,10 @@ static int or51132_set_parameters(struct dvb_frontend* fe,
or51132_setmode(fe);
}

dvb_pll_configure(state->config->pll_desc, buf,
param->frequency, 0);
dprintk("set_parameters tuner bytes: 0x%02x 0x%02x "
"0x%02x 0x%02x\n",buf[0],buf[1],buf[2],buf[3]);
if (i2c_writebytes(state, state->config->pll_address, buf, 4))
printk(KERN_WARNING "or51132: set_parameters error "
"writing to tuner\n");
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);
}

/* Set to current mode */
or51132_setmode(fe);
Expand Down
2 changes: 0 additions & 2 deletions drivers/media/dvb/frontends/or51132.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ struct or51132_config
{
/* The demodulator's i2c address */
u8 demod_address;
u8 pll_address;
struct dvb_pll_desc *pll_desc;

/* Need to set device param for start_dma */
int (*set_ts_params)(struct dvb_frontend* fe, int is_punctured);
Expand Down

0 comments on commit 44d92aa

Please sign in to comment.