diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2012-05-14 18:50:34 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 10:06:08 -0300 |
| commit | 10d67371fc6e7d4e3b869166843ba174763fe5aa (patch) | |
| tree | 6a5f315af8c4a480145a01fd9dfc9a6b07b90359 /drivers/media/dvb | |
| parent | 311362149230cf31e0ac1b20bca4a03a2623ca89 (diff) | |
| download | linux-10d67371fc6e7d4e3b869166843ba174763fe5aa.tar.bz2 | |
[media] DVB: remove "stats" property bits from ATSC-MH API property additions
Mauro is proposing a new API to handle statistics. This functionality will
be returned after the statistics API is ready. Just remove them for now.
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.c | 12 | ||||
| -rw-r--r-- | drivers/media/dvb/dvb-core/dvb_frontend.h | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/lg2160.c | 9 |
3 files changed, 8 insertions, 17 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index cd23f303162a..aebcdf221dda 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -1049,9 +1049,6 @@ static struct dtv_cmds_h dtv_cmds[DTV_MAX_COMMAND + 1] = { _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_B, 0, 0), _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_C, 0, 0), _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_D, 0, 0), - _DTV_CMD(DTV_ATSCMH_FIC_ERR, 0, 0), - _DTV_CMD(DTV_ATSCMH_CRC_ERR, 0, 0), - _DTV_CMD(DTV_ATSCMH_RS_ERR, 0, 0), }; static void dtv_property_dump(struct dtv_property *tvp) @@ -1438,15 +1435,6 @@ static int dtv_property_process_get(struct dvb_frontend *fe, case DTV_ATSCMH_SCCC_CODE_MODE_D: tvp->u.data = fe->dtv_property_cache.atscmh_sccc_code_mode_d; break; - case DTV_ATSCMH_FIC_ERR: - tvp->u.data = fe->dtv_property_cache.atscmh_fic_err; - break; - case DTV_ATSCMH_CRC_ERR: - tvp->u.data = fe->dtv_property_cache.atscmh_crc_err; - break; - case DTV_ATSCMH_RS_ERR: - tvp->u.data = fe->dtv_property_cache.atscmh_rs_err; - break; default: return -EINVAL; diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 80f5c27ddc9f..e929d5697b87 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h @@ -390,10 +390,6 @@ struct dtv_frontend_properties { u8 atscmh_sccc_code_mode_b; u8 atscmh_sccc_code_mode_c; u8 atscmh_sccc_code_mode_d; - - u16 atscmh_fic_err; - u16 atscmh_crc_err; - u16 atscmh_rs_err; }; struct dvb_frontend { diff --git a/drivers/media/dvb/frontends/lg2160.c b/drivers/media/dvb/frontends/lg2160.c index fafe522b013f..7bc284217527 100644 --- a/drivers/media/dvb/frontends/lg2160.c +++ b/drivers/media/dvb/frontends/lg2160.c @@ -804,6 +804,7 @@ fail: /* ------------------------------------------------------------------------ */ +#if 0 static int lg216x_read_fic_err_count(struct lg216x_state *state, u8 *err) { u8 fic_err; @@ -936,6 +937,7 @@ static int lg216x_read_rs_err_count(struct lg216x_state *state, u16 *err) } return ret; } +#endif /* ------------------------------------------------------------------------ */ @@ -1016,6 +1018,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe) if (lg_fail(ret)) goto fail; } +#if 0 ret = lg216x_read_fic_err_count(state, (u8 *)&fe->dtv_property_cache.atscmh_fic_err); if (lg_fail(ret)) @@ -1042,6 +1045,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe) break; } lg_fail(ret); +#endif fail: return ret; } @@ -1319,13 +1323,16 @@ static int lg216x_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) { struct lg216x_state *state = fe->demodulator_priv; int ret; - +#if 0 ret = lg216x_read_rs_err_count(state, &fe->dtv_property_cache.atscmh_rs_err); if (lg_fail(ret)) goto fail; *ucblocks = fe->dtv_property_cache.atscmh_rs_err; +#else + *ucblocks = 0; +#endif fail: return 0; } |