From 3df1693f3ed91b30d0b2dae18a5b57c54f335927 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 26 Dec 2011 13:42:21 -0300 Subject: [PATCH] --- yaml --- r: 285541 b: refs/heads/master c: 16e3d13152797fc2ae66b948cd3229e9551896c3 h: refs/heads/master i: 285539: 491b1bedca01921ea6d5e82d75f7e19159c4ed72 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/s921.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 9cf7de98ad97..09c99ea27a65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f82e6b18cb48e261f0a15a7f12c843b488234a5 +refs/heads/master: 16e3d13152797fc2ae66b948cd3229e9551896c3 diff --git a/trunk/drivers/media/dvb/frontends/s921.c b/trunk/drivers/media/dvb/frontends/s921.c index 5e8f2a8749db..4c452f487cd1 100644 --- a/trunk/drivers/media/dvb/frontends/s921.c +++ b/trunk/drivers/media/dvb/frontends/s921.c @@ -262,9 +262,9 @@ static int s921_i2c_readreg(struct s921_state *state, u8 i2c_addr, u8 reg) s921_i2c_writeregdata(state, state->config->demod_address, \ regdata, ARRAY_SIZE(regdata)) -static int s921_pll_tune(struct dvb_frontend *fe, - struct dvb_frontend_parameters *p) +static int s921_pll_tune(struct dvb_frontend *fe) { + struct dtv_frontend_properties *p = &fe->dtv_property_cache; struct s921_state *state = fe->demodulator_priv; int band, rc, i; unsigned long f_offset; @@ -414,9 +414,9 @@ static int s921_read_signal_strength(struct dvb_frontend *fe, u16 *strength) return 0; } -static int s921_set_frontend(struct dvb_frontend *fe, - struct dvb_frontend_parameters *p) +static int s921_set_frontend(struct dvb_frontend *fe) { + struct dtv_frontend_properties *p = &fe->dtv_property_cache; struct s921_state *state = fe->demodulator_priv; int rc; @@ -424,7 +424,7 @@ static int s921_set_frontend(struct dvb_frontend *fe, /* FIXME: We don't know how to use non-auto mode */ - rc = s921_pll_tune(fe, p); + rc = s921_pll_tune(fe); if (rc < 0) return rc; @@ -434,7 +434,7 @@ static int s921_set_frontend(struct dvb_frontend *fe, } static int s921_get_frontend(struct dvb_frontend *fe, - struct dvb_frontend_parameters *p) + struct dtv_frontend_properties *p) { struct s921_state *state = fe->demodulator_priv; @@ -455,7 +455,7 @@ static int s921_tune(struct dvb_frontend *fe, dprintk("\n"); if (params != NULL) - rc = s921_set_frontend(fe, params); + rc = s921_set_frontend(fe); if (!(mode_flags & FE_TUNE_MODE_ONESHOT)) s921_read_status(fe, status); @@ -510,6 +510,7 @@ struct dvb_frontend *s921_attach(const struct s921_config *config, EXPORT_SYMBOL(s921_attach); static struct dvb_frontend_ops s921_ops = { + .delsys = { SYS_ISDBT }, /* Use dib8000 values per default */ .info = { .name = "Sharp S921", @@ -534,8 +535,8 @@ static struct dvb_frontend_ops s921_ops = { .release = s921_release, .init = s921_initfe, - .set_frontend_legacy = s921_set_frontend, - .get_frontend_legacy = s921_get_frontend, + .set_frontend = s921_set_frontend, + .get_frontend = s921_get_frontend, .read_status = s921_read_status, .read_signal_strength = s921_read_signal_strength, .tune = s921_tune,