diff options
Diffstat (limited to 'linux/drivers/media/dvb/frontends/tda80xx.c')
| -rw-r--r-- | linux/drivers/media/dvb/frontends/tda80xx.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/dvb/frontends/tda80xx.c b/linux/drivers/media/dvb/frontends/tda80xx.c index 7954e8732..996fd4beb 100644 --- a/linux/drivers/media/dvb/frontends/tda80xx.c +++ b/linux/drivers/media/dvb/frontends/tda80xx.c @@ -46,8 +46,6 @@ struct tda80xx_state { struct i2c_adapter* i2c; - struct dvb_frontend_ops ops; - /* configuration settings */ const struct tda80xx_config* config; @@ -523,9 +521,9 @@ static int tda80xx_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par { struct tda80xx_state* state = fe->demodulator_priv; - 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); + 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); } tda80xx_set_parameters(state, p->inversion, p->u.qpsk.symbol_rate, p->u.qpsk.fec_inner); @@ -655,7 +653,6 @@ struct dvb_frontend* tda80xx_attach(const struct tda80xx_config* config, /* setup the state */ state->config = config; state->i2c = i2c; - memcpy(&state->ops, &tda80xx_ops, sizeof(struct dvb_frontend_ops)); state->spectral_inversion = INVERSION_AUTO; state->code_rate = FEC_AUTO; state->status = 0; @@ -690,7 +687,7 @@ struct dvb_frontend* tda80xx_attach(const struct tda80xx_config* config, } /* create dvb_frontend */ - state->frontend.ops = &state->ops; + memcpy(&state->frontend.ops, &tda80xx_ops, sizeof(struct dvb_frontend_ops)); state->frontend.demodulator_priv = state; return &state->frontend; |