V4L/DVB (8997): S2API: Cleanup SYMBOLRATE, INNERFEC -> SYMBOL_RATE, INNER_FEC

This is now consistent with the existing API.

Signed-off-by: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 763da968236fc30e231ee407f506b2d152fe28d0..ce1de403e99e42ec8590845605ab7918051b95c9 100644 (file)
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -794,14 +794,14 @@ struct dtv_cmds_h dtv_cmds[] = {
                .set    = 1,
                .buffer = 1,
        },
-       [DTV_SET_SYMBOLRATE] = {
-               .name   = "DTV_SET_SYMBOLRATE",
-               .cmd    = DTV_SET_SYMBOLRATE,
+       [DTV_SET_SYMBOL_RATE] = {
+               .name   = "DTV_SET_SYMBOL_RATE",
+               .cmd    = DTV_SET_SYMBOL_RATE,
                .set    = 1,
        },
-       [DTV_SET_INNERFEC] = {
-               .name   = "DTV_SET_INNERFEC",
-               .cmd    = DTV_SET_INNERFEC,
+       [DTV_SET_INNER_FEC] = {
+               .name   = "DTV_SET_INNER_FEC",
+               .cmd    = DTV_SET_INNER_FEC,
                .set    = 1,
        },
        [DTV_SET_VOLTAGE] = {
@@ -867,14 +867,14 @@ struct dtv_cmds_h dtv_cmds[] = {
                .set    = 0,
                .buffer = 1,
        },
-       [DTV_GET_SYMBOLRATE] = {
-               .name   = "DTV_GET_SYMBOLRATE",
-               .cmd    = DTV_GET_SYMBOLRATE,
+       [DTV_GET_SYMBOL_RATE] = {
+               .name   = "DTV_GET_SYMBOL_RATE",
+               .cmd    = DTV_GET_SYMBOL_RATE,
                .set    = 0,
        },
-       [DTV_GET_INNERFEC] = {
-               .name   = "DTV_GET_INNERFEC",
-               .cmd    = DTV_GET_INNERFEC,
+       [DTV_GET_INNER_FEC] = {
+               .name   = "DTV_GET_INNER_FEC",
+               .cmd    = DTV_GET_INNER_FEC,
                .set    = 0,
        },
        [DTV_GET_VOLTAGE] = {
@@ -1201,16 +1201,16 @@ int dtv_property_process(struct dvb_frontend *fe, struct dtv_property *tvp,
        case DTV_GET_INVERSION:
                tvp->u.data = fe->dtv_property_cache.inversion;
                break;
-       case DTV_SET_SYMBOLRATE:
+       case DTV_SET_SYMBOL_RATE:
                fe->dtv_property_cache.symbol_rate = tvp->u.data;
                break;
-       case DTV_GET_SYMBOLRATE:
+       case DTV_GET_SYMBOL_RATE:
                tvp->u.data = fe->dtv_property_cache.symbol_rate;
                break;
-       case DTV_SET_INNERFEC:
+       case DTV_SET_INNER_FEC:
                fe->dtv_property_cache.fec_inner = tvp->u.data;
                break;
-       case DTV_GET_INNERFEC:
+       case DTV_GET_INNER_FEC:
                tvp->u.data = fe->dtv_property_cache.fec_inner;
                break;
        case DTV_SET_PILOT:

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index f667bf377a7bb2a84302d8bb7e2a12f20e81f771..bfd670fa16b2d50afb28a5e8786fee13038e484a 100644 (file)
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -259,8 +259,8 @@ typedef enum dtv_cmd_types {
        DTV_SET_BANDWIDTH,
        DTV_SET_INVERSION,
        DTV_SET_DISEQC_MASTER,
-       DTV_SET_SYMBOLRATE,
-       DTV_SET_INNERFEC,
+       DTV_SET_SYMBOL_RATE,
+       DTV_SET_INNER_FEC,
        DTV_SET_VOLTAGE,
        DTV_SET_TONE,
        DTV_SET_PILOT,
@@ -271,8 +271,8 @@ typedef enum dtv_cmd_types {
        DTV_GET_BANDWIDTH,
        DTV_GET_INVERSION,
        DTV_GET_DISEQC_SLAVE_REPLY,
-       DTV_GET_SYMBOLRATE,
-       DTV_GET_INNERFEC,
+       DTV_GET_SYMBOL_RATE,
+       DTV_GET_INNER_FEC,
        DTV_GET_VOLTAGE,
        DTV_GET_TONE,
        DTV_GET_PILOT,