diff options
Diffstat (limited to 'drivers')
-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] = { | |||
1049 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_B, 0, 0), | 1049 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_B, 0, 0), |
1050 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_C, 0, 0), | 1050 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_C, 0, 0), |
1051 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_D, 0, 0), | 1051 | _DTV_CMD(DTV_ATSCMH_SCCC_CODE_MODE_D, 0, 0), |
1052 | _DTV_CMD(DTV_ATSCMH_FIC_ERR, 0, 0), | ||
1053 | _DTV_CMD(DTV_ATSCMH_CRC_ERR, 0, 0), | ||
1054 | _DTV_CMD(DTV_ATSCMH_RS_ERR, 0, 0), | ||
1055 | }; | 1052 | }; |
1056 | 1053 | ||
1057 | static void dtv_property_dump(struct dtv_property *tvp) | 1054 | static void dtv_property_dump(struct dtv_property *tvp) |
@@ -1438,15 +1435,6 @@ static int dtv_property_process_get(struct dvb_frontend *fe, | |||
1438 | case DTV_ATSCMH_SCCC_CODE_MODE_D: | 1435 | case DTV_ATSCMH_SCCC_CODE_MODE_D: |
1439 | tvp->u.data = fe->dtv_property_cache.atscmh_sccc_code_mode_d; | 1436 | tvp->u.data = fe->dtv_property_cache.atscmh_sccc_code_mode_d; |
1440 | break; | 1437 | break; |
1441 | case DTV_ATSCMH_FIC_ERR: | ||
1442 | tvp->u.data = fe->dtv_property_cache.atscmh_fic_err; | ||
1443 | break; | ||
1444 | case DTV_ATSCMH_CRC_ERR: | ||
1445 | tvp->u.data = fe->dtv_property_cache.atscmh_crc_err; | ||
1446 | break; | ||
1447 | case DTV_ATSCMH_RS_ERR: | ||
1448 | tvp->u.data = fe->dtv_property_cache.atscmh_rs_err; | ||
1449 | break; | ||
1450 | 1438 | ||
1451 | default: | 1439 | default: |
1452 | return -EINVAL; | 1440 | 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 { | |||
390 | u8 atscmh_sccc_code_mode_b; | 390 | u8 atscmh_sccc_code_mode_b; |
391 | u8 atscmh_sccc_code_mode_c; | 391 | u8 atscmh_sccc_code_mode_c; |
392 | u8 atscmh_sccc_code_mode_d; | 392 | u8 atscmh_sccc_code_mode_d; |
393 | |||
394 | u16 atscmh_fic_err; | ||
395 | u16 atscmh_crc_err; | ||
396 | u16 atscmh_rs_err; | ||
397 | }; | 393 | }; |
398 | 394 | ||
399 | struct dvb_frontend { | 395 | 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: | |||
804 | 804 | ||
805 | /* ------------------------------------------------------------------------ */ | 805 | /* ------------------------------------------------------------------------ */ |
806 | 806 | ||
807 | #if 0 | ||
807 | static int lg216x_read_fic_err_count(struct lg216x_state *state, u8 *err) | 808 | static int lg216x_read_fic_err_count(struct lg216x_state *state, u8 *err) |
808 | { | 809 | { |
809 | u8 fic_err; | 810 | u8 fic_err; |
@@ -936,6 +937,7 @@ static int lg216x_read_rs_err_count(struct lg216x_state *state, u16 *err) | |||
936 | } | 937 | } |
937 | return ret; | 938 | return ret; |
938 | } | 939 | } |
940 | #endif | ||
939 | 941 | ||
940 | /* ------------------------------------------------------------------------ */ | 942 | /* ------------------------------------------------------------------------ */ |
941 | 943 | ||
@@ -1016,6 +1018,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe) | |||
1016 | if (lg_fail(ret)) | 1018 | if (lg_fail(ret)) |
1017 | goto fail; | 1019 | goto fail; |
1018 | } | 1020 | } |
1021 | #if 0 | ||
1019 | ret = lg216x_read_fic_err_count(state, | 1022 | ret = lg216x_read_fic_err_count(state, |
1020 | (u8 *)&fe->dtv_property_cache.atscmh_fic_err); | 1023 | (u8 *)&fe->dtv_property_cache.atscmh_fic_err); |
1021 | if (lg_fail(ret)) | 1024 | if (lg_fail(ret)) |
@@ -1042,6 +1045,7 @@ static int lg216x_get_frontend(struct dvb_frontend *fe) | |||
1042 | break; | 1045 | break; |
1043 | } | 1046 | } |
1044 | lg_fail(ret); | 1047 | lg_fail(ret); |
1048 | #endif | ||
1045 | fail: | 1049 | fail: |
1046 | return ret; | 1050 | return ret; |
1047 | } | 1051 | } |
@@ -1319,13 +1323,16 @@ static int lg216x_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) | |||
1319 | { | 1323 | { |
1320 | struct lg216x_state *state = fe->demodulator_priv; | 1324 | struct lg216x_state *state = fe->demodulator_priv; |
1321 | int ret; | 1325 | int ret; |
1322 | 1326 | #if 0 | |
1323 | ret = lg216x_read_rs_err_count(state, | 1327 | ret = lg216x_read_rs_err_count(state, |
1324 | &fe->dtv_property_cache.atscmh_rs_err); | 1328 | &fe->dtv_property_cache.atscmh_rs_err); |
1325 | if (lg_fail(ret)) | 1329 | if (lg_fail(ret)) |
1326 | goto fail; | 1330 | goto fail; |
1327 | 1331 | ||
1328 | *ucblocks = fe->dtv_property_cache.atscmh_rs_err; | 1332 | *ucblocks = fe->dtv_property_cache.atscmh_rs_err; |
1333 | #else | ||
1334 | *ucblocks = 0; | ||
1335 | #endif | ||
1329 | fail: | 1336 | fail: |
1330 | return 0; | 1337 | return 0; |
1331 | } | 1338 | } |