[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>

diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index d63153522b60b36f0c33e7fca4019f84bd7726a5..e633c097a8d14b954975743e67816867f5b9fdaa 100644 (file)
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -664,21 +664,6 @@ typedef enum atscmh_sccc_code_mode {
 } atscmh_sccc_code_mode_t;
 </programlisting>
                </section>
-               <section id="DTV-ATSCMH-FIC-ERR">
-                       <title><constant>DTV_ATSCMH_FIC_ERR</constant></title>
-                       <para>FIC error count.</para>
-                       <para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
-               </section>
-               <section id="DTV-ATSCMH-CRC-ERR">
-                       <title><constant>DTV_ATSCMH_CRC_ERR</constant></title>
-                       <para>CRC error count.</para>
-                       <para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
-               </section>
-               <section id="DTV-ATSCMH-RS-ERR">
-                       <title><constant>DTV_ATSCMH_RS_ERR</constant></title>
-                       <para>RS error count.</para>
-                       <para>Possible values: 0, 1, 2, 3, ..., 0xffff</para>
-               </section>
        </section>
        <section id="DTV-API-VERSION">
        <title><constant>DTV_API_VERSION</constant></title>
@@ -947,9 +932,6 @@ typedef enum fe_hierarchy {
                                <listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-B"><constant>DTV_ATSCMH_SCCC_CODE_MODE_B</constant></link></para></listitem>
                                <listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-C"><constant>DTV_ATSCMH_SCCC_CODE_MODE_C</constant></link></para></listitem>
                                <listitem><para><link linkend="DTV-ATSCMH-SCCC-CODE_MODE-D"><constant>DTV_ATSCMH_SCCC_CODE_MODE_D</constant></link></para></listitem>
-                               <listitem><para><link linkend="DTV-ATSCMH-FIC-ERR"><constant>DTV_ATSCMH_FIC_ERR</constant></link></para></listitem>
-                               <listitem><para><link linkend="DTV-ATSCMH-CRC-ERR"><constant>DTV_ATSCMH_CRC_ERR</constant></link></para></listitem>
-                               <listitem><para><link linkend="DTV-ATSCMH-RS-ERR"><constant>DTV_ATSCMH_RS_ERR</constant></link></para></listitem>
                        </itemizedlist>
                </section>
        </section>

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index cd23f303162a832dac34b986b6353c4dacee9db8..aebcdf221ddacece9fd1413aa2c9906c836c88ba 100644 (file)
--- 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 80f5c27ddc9fbf2e3b592a4ccf7b459cef8b69a2..e929d5697b8799bb8597d09dd620dc510dd282dc 100644 (file)
--- 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 fafe522b013f6a7368b4ae52723914fe36f4cd67..7bc28421752755eabf57bbd114865e92191986c1 100644 (file)
--- 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;
 }

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 5aedd5ae7f8fbd8d1603b44166e8495db89647e2..f50d4058c5fbfa1c8c50e5773456a46dd03736f1 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -336,11 +336,8 @@ struct dvb_frontend_event {
 #define DTV_ATSCMH_SCCC_CODE_MODE_B    57
 #define DTV_ATSCMH_SCCC_CODE_MODE_C    58
 #define DTV_ATSCMH_SCCC_CODE_MODE_D    59
-#define DTV_ATSCMH_FIC_ERR             60
-#define DTV_ATSCMH_CRC_ERR             61
-#define DTV_ATSCMH_RS_ERR              62
 
-#define DTV_MAX_COMMAND                                DTV_ATSCMH_RS_ERR
+#define DTV_MAX_COMMAND                                DTV_ATSCMH_SCCC_CODE_MODE_D
 
 typedef enum fe_pilot {
        PILOT_ON,