[media] dvb: Remove ops->info.type from frontends

Now that this field is deprecated, and core generates it for
DVBv3 calls, remove it from the drivers.

It also adds .delsys on the few drivers where this were missed.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index 9c5cbf12b5acde087c2e2b28785903bdea3a2c4b..430b3eb118152c1c3606e4cf355f3a925777f672 100644 (file)
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1762,7 +1762,6 @@ static struct dvb_frontend_ops dst_dvbt_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "DST DVB-T",
-               .type = FE_OFDM,
                .frequency_min = 137000000,
                .frequency_max = 858000000,
                .frequency_stepsize = 166667,
@@ -1792,7 +1791,6 @@ static struct dvb_frontend_ops dst_dvbs_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name = "DST DVB-S",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1000,     /* kHz for QPSK frontends */
@@ -1822,7 +1820,6 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
        .delsys = { SYS_DVBC_ANNEX_A },
        .info = {
                .name = "DST DVB-C",
-               .type = FE_QAM,
                .frequency_stepsize = 62500,
                .frequency_min = 51000000,
                .frequency_max = 858000000,
@@ -1849,9 +1846,9 @@ static struct dvb_frontend_ops dst_dvbc_ops = {
 };
 
 static struct dvb_frontend_ops dst_atsc_ops = {
+       .delsys = { SYS_ATSC },
        .info = {
                .name = "DST ATSC",
-               .type = FE_ATSC,
                .frequency_stepsize = 62500,
                .frequency_min = 510000000,
                .frequency_max = 858000000,

diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index 0e1b04f31413cdd30406818bd5836b237aaf36f4..740f3f496f12c171bfe19564eafaa69fdfa6f40d 100644 (file)
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -1458,7 +1458,6 @@ static struct dvb_frontend_ops af9005_fe_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                 .name = "AF9005 USB DVB-T",
-                .type = FE_OFDM,
                 .frequency_min = 44250000,
                 .frequency_max = 867250000,
                 .frequency_stepsize = 250000,

diff --git a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
index 0315db897cdd4ee9945ad66ef76d426d1cba8e52..8a57ed8272dec10adfbbd989f81442ed6cc48ef9 100644 (file)
--- a/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
+++ b/drivers/media/dvb/dvb-usb/cinergyT2-fe.c
@@ -323,7 +323,6 @@ static struct dvb_frontend_ops cinergyt2_fe_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = DRIVER_NAME,
-               .type                   = FE_OFDM,
                .frequency_min          = 174000000,
                .frequency_max          = 862000000,
                .frequency_stepsize     = 166667,

diff --git a/drivers/media/dvb/dvb-usb/dtt200u-fe.c b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
index c94da3c1ea516de3a5027a3cf3dcd6e37a5cdc31..3d81daa4917229ff3c92a8d7c59dc20eae34f8cc 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dtt200u-fe.c
+++ b/drivers/media/dvb/dvb-usb/dtt200u-fe.c
@@ -180,7 +180,6 @@ static struct dvb_frontend_ops dtt200u_fe_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "WideView USB DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 44250000,
                .frequency_max          = 867250000,
                .frequency_stepsize     = 250000,

diff --git a/drivers/media/dvb/dvb-usb/friio-fe.c b/drivers/media/dvb/dvb-usb/friio-fe.c
index 0660a875b21bd540e6a1f85247bc261f115a0508..90a70c66a96e12a019654a6f3ff74934fefde85c 100644 (file)
--- a/drivers/media/dvb/dvb-usb/friio-fe.c
+++ b/drivers/media/dvb/dvb-usb/friio-fe.c
@@ -442,7 +442,6 @@ static struct dvb_frontend_ops jdvbt90502_ops = {
        .delsys = { SYS_ISDBT },
        .info = {
                .name                   = "Comtech JDVBT90502 ISDB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 473000000, /* UHF 13ch, center */
                .frequency_max          = 767142857, /* UHF 62ch, center */
                .frequency_stepsize     = JDVBT90502_PLL_CLK / JDVBT90502_PLL_DIVIDER,

diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
index 79db9d62970cdca97deb2301dd9092181348b69d..67957dd99ede5bf4bf70e06c287f56478728c5b1 100644 (file)
--- a/drivers/media/dvb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
@@ -329,7 +329,6 @@ static struct dvb_frontend_ops gp8psk_fe_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "Genpix DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 800000,
                .frequency_max          = 2250000,
                .frequency_stepsize     = 100,

diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
index 694e207d8f6ba7f894e00cabf4a1e8b8223b04f2..d83df4bb72d352308f8baff11e7fe6ad72a63026 100644 (file)
--- a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
@@ -553,7 +553,6 @@ static struct dvb_frontend_ops mxl111sf_demod_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name               = "MaxLinear MxL111SF DVB-T demodulator",
-               .type               = FE_OFDM,
                .frequency_min      = 177000000,
                .frequency_max      = 858000000,
                .frequency_stepsize = 166666,

diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c
index 8d8c6ad4022107accf35144f0d7534b76ae6cdcc..5eab468dd9046adbe76738c157c60efd1bd66b76 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp702x-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c
@@ -346,7 +346,6 @@ static struct dvb_frontend_ops vp702x_fe_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name           = "Twinhan DST-like frontend (VP7021/VP7020) DVB-S",
-               .type           = FE_QPSK,
                .frequency_min       = 950000,
                .frequency_max       = 2150000,
                .frequency_stepsize  = 1000,   /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c
index ecbd62384a68da19da60eb9b1841782b7a30d404..b8825b18c003a32c52066f616b26ef0b95758f21 100644 (file)
--- a/drivers/media/dvb/dvb-usb/vp7045-fe.c
+++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c
@@ -161,7 +161,6 @@ static struct dvb_frontend_ops vp7045_fe_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Twinhan VP7045/46 USB DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 44250000,
                .frequency_max          = 867250000,
                .frequency_stepsize     = 1000,

diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index e6ba3e014cb4ee8dfa30847e5a0eee7612138647..d4227c63986c4fbd1cf091b002fe4f0c3e80e6e9 100644 (file)
--- a/drivers/media/dvb/frontends/af9013.c
+++ b/drivers/media/dvb/frontends/af9013.c
@@ -1483,7 +1483,6 @@ static struct dvb_frontend_ops af9013_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "Afatech AF9013",
-               .type = FE_OFDM,
                .frequency_min = 174000000,
                .frequency_max = 862000000,
                .frequency_stepsize = 250000,

diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c
index ff86074d3b87c442807eaa341cd839ed456b214c..a2261ea2cf82a3cf148dbb5515e3add5a309756d 100644 (file)
--- a/drivers/media/dvb/frontends/atbm8830.c
+++ b/drivers/media/dvb/frontends/atbm8830.c
@@ -431,7 +431,6 @@ static struct dvb_frontend_ops atbm8830_ops = {
        .delsys = { SYS_DMBTH },
        .info = {
                .name = "AltoBeam ATBM8830/8831 DMB-TH",
-               .type = FE_OFDM,
                .frequency_min = 474000000,
                .frequency_max = 858000000,
                .frequency_stepsize = 10000,

diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c
index 762cd5e62faeb80b284607ceb2b9f7805159f57a..c688b95df48645682fec8c2cefbd17cb51b5271e 100644 (file)
--- a/drivers/media/dvb/frontends/au8522_dig.c
+++ b/drivers/media/dvb/frontends/au8522_dig.c
@@ -1013,7 +1013,6 @@ static struct dvb_frontend_ops au8522_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name                   = "Auvitek AU8522 QAM/8VSB Frontend",
-               .type                   = FE_ATSC,
                .frequency_min          = 54000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 62500,

diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index a53f83acb386ed79bf45a12834165efefc1835d4..033cd7ad3ca2cb9d76f7bace048fdb1f72974bdd 100644 (file)
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -825,7 +825,6 @@ static struct dvb_frontend_ops bcm3510_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name = "Broadcom BCM3510 VSB/QAM frontend",
-               .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 803000000,
                /* stepsize is just a guess */

diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index a5b1521d238d63d5b9d21bd326fed3b3f5eb3b39..f2a90f990ce330548079b7e5ce8e9b74f1a034c9 100644 (file)
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -408,7 +408,6 @@ static struct dvb_frontend_ops cx22700_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Conexant CX22700 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 470000000,
                .frequency_max          = 860000000,
                .frequency_stepsize     = 166667,

diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index a0dcbd6b424a79acc45baeb08c56d45bcce81004..faba8248508625cccc9eec3c291c51f4191031a1 100644 (file)
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -606,7 +606,6 @@ static const struct dvb_frontend_ops cx22702_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Conexant CX22702 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 177000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 166666,

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 2f07c494e7fe0fc076d990730669de8045604877..5101f10f2d7a010cd4a2702e20ceabd0ca8eb2b7 100644 (file)
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -627,7 +627,6 @@ static struct dvb_frontend_ops cx24110_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name = "Conexant CX24110 DVB-S",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1011,  /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index e29de1ca98550bb5d035f2f052bfb8a40f5cfe7a..b4887918653719740f34398e762e604869000c05 100644 (file)
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -1469,7 +1469,6 @@ static struct dvb_frontend_ops cx24116_ops = {
        .delsys = { SYS_DVBS, SYS_DVBS2 },
        .info = {
                .name = "Conexant CX24116/CX24118",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1011, /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index ad5d1a450b098ca6d071d70d4f47279df895f39c..7e28b4ee7d4febb9f815ea569fbfc14f38764b6a 100644 (file)
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -1128,7 +1128,6 @@ static struct dvb_frontend_ops cx24123_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name = "Conexant CX24123/CX24109",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1011, /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/cxd2820r_core.c b/drivers/media/dvb/frontends/cxd2820r_core.c
index 07c1a956b771e1fe5c25827e099b2ec9b4e8d595..93e1b12e79077ddc851ffd5fd85c8240c795eed7 100644 (file)
--- a/drivers/media/dvb/frontends/cxd2820r_core.c
+++ b/drivers/media/dvb/frontends/cxd2820r_core.c
@@ -554,11 +554,9 @@ static int cxd2820r_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
 
 static const struct dvb_frontend_ops cxd2820r_ops = {
        .delsys = { SYS_DVBT, SYS_DVBT2, SYS_DVBC_ANNEX_A },
-
        /* default: DVB-T/T2 */
        .info = {
                .name = "Sony CXD2820R (DVB-T/T2)",
-               .type = FE_OFDM,
 
                .caps = FE_CAN_FEC_1_2                  |
                        FE_CAN_FEC_2_3                  |

diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index a1c5bdbab6903ffdd603e68d52fc3c440dadc0ad..af91e0c92339a994dea3a342c869aa9d43441489 100644 (file)
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -793,7 +793,6 @@ static struct dvb_frontend_ops dib3000mb_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "DiBcom 3000M-B DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 44250000,
                .frequency_max          = 867250000,
                .frequency_stepsize     = 62500,

diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c
index e500b8965a5fad43fbe72fadc179fb5801f66fce..ffad181a96920bf90250d3aba9757247f1b56cec 100644 (file)
--- a/drivers/media/dvb/frontends/dib3000mc.c
+++ b/drivers/media/dvb/frontends/dib3000mc.c
@@ -906,7 +906,6 @@ static struct dvb_frontend_ops dib3000mc_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "DiBcom 3000MC/P",
-               .type = FE_OFDM,
                .frequency_min      = 44250000,
                .frequency_max      = 867250000,
                .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c
index 2a2d6466ecc57edccd2bd6b7969126b675c8870d..148bf79236fbcb858e01d98500424939b03a6f47 100644 (file)
--- a/drivers/media/dvb/frontends/dib7000m.c
+++ b/drivers/media/dvb/frontends/dib7000m.c
@@ -1439,7 +1439,6 @@ static struct dvb_frontend_ops dib7000m_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "DiBcom 7000MA/MB/PA/PB/MC",
-               .type = FE_OFDM,
                .frequency_min      = 44250000,
                .frequency_max      = 867250000,
                .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c
index 361bdb18e3b23e3715c6602873215cb7bde8aca4..5ceadc285b3ad59ef187d4c074db352ff1155d5c 100644 (file)
--- a/drivers/media/dvb/frontends/dib7000p.c
+++ b/drivers/media/dvb/frontends/dib7000p.c
@@ -2430,7 +2430,6 @@ static struct dvb_frontend_ops dib7000p_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                 .name = "DiBcom 7000PC",
-                .type = FE_OFDM,
                 .frequency_min = 44250000,
                 .frequency_max = 867250000,
                 .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c
index fe07d74a1f1ec65729150b36df04da0e14bca080..9ca34f495009dc29f15509f9075986af3247fe48 100644 (file)
--- a/drivers/media/dvb/frontends/dib8000.c
+++ b/drivers/media/dvb/frontends/dib8000.c
@@ -3464,7 +3464,6 @@ static const struct dvb_frontend_ops dib8000_ops = {
        .delsys = { SYS_ISDBT },
        .info = {
                 .name = "DiBcom 8000 ISDB-T",
-                .type = FE_OFDM,
                 .frequency_min = 44250000,
                 .frequency_max = 867250000,
                 .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/dib9000.c b/drivers/media/dvb/frontends/dib9000.c
index 2312b4d20d4aa95a649d46fa87e82101b7c0eb33..863ef3cfab9f908b59c195a77960c7bb779b120c 100644 (file)
--- a/drivers/media/dvb/frontends/dib9000.c
+++ b/drivers/media/dvb/frontends/dib9000.c
@@ -2500,7 +2500,6 @@ static struct dvb_frontend_ops dib9000_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                 .name = "DiBcom 9000",
-                .type = FE_OFDM,
                 .frequency_min = 44250000,
                 .frequency_max = 867250000,
                 .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c
index 252062040488f428a7804581f4594a29ed4a627c..7bf39cda83c55ef8305a72e5ca9a571db9d86e8b 100644 (file)
--- a/drivers/media/dvb/frontends/drxd_hard.c
+++ b/drivers/media/dvb/frontends/drxd_hard.c
@@ -2924,7 +2924,6 @@ static struct dvb_frontend_ops drxd_ops = {
        .delsys = { SYS_DVBT},
        .info = {
                 .name = "Micronas DRXD DVB-T",
-                .type = FE_OFDM,
                 .frequency_min = 47125000,
                 .frequency_max = 855250000,
                 .frequency_stepsize = 166667,

diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c
index 36e1c82e385cd88065e1566909d76db83f7eca4c..67a1e39d1eabed827083f2d1c7ba51ca8bccb1b7 100644 (file)
--- a/drivers/media/dvb/frontends/drxk_hard.c
+++ b/drivers/media/dvb/frontends/drxk_hard.c
@@ -6355,7 +6355,6 @@ static struct dvb_frontend_ops drxk_c_ops = {
        .delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },
        .info = {
                 .name = "DRXK DVB-C",
-                .type = FE_QAM,
                 .frequency_stepsize = 62500,
                 .frequency_min = 47000000,
                 .frequency_max = 862000000,
@@ -6382,7 +6381,6 @@ static struct dvb_frontend_ops drxk_t_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                 .name = "DRXK DVB-T",
-                .type = FE_OFDM,
                 .frequency_min = 47125000,
                 .frequency_max = 865000000,
                 .frequency_stepsize = 166667,

diff --git a/drivers/media/dvb/frontends/ds3000.c b/drivers/media/dvb/frontends/ds3000.c
index c6a43c49e72814b3ab7f4e70eeb001d4317f657a..938777065de6d1d14effed1ab4f9a01b3f7dc8c7 100644 (file)
--- a/drivers/media/dvb/frontends/ds3000.c
+++ b/drivers/media/dvb/frontends/ds3000.c
@@ -1267,7 +1267,6 @@ static struct dvb_frontend_ops ds3000_ops = {
        .delsys = { SYS_DVBS, SYS_DVBS2},
        .info = {
                .name = "Montage Technology DS3000/TS2020",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1011, /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c
index ac4c8d2221d0bd4827308aebd80a20f50f6753d7..dcfc902c8678be0c64b04989f549639e8114fa47 100644 (file)
--- a/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -177,7 +177,6 @@ static struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Dummy DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 0,
                .frequency_max          = 863250000,
                .frequency_stepsize     = 62500,
@@ -209,7 +208,6 @@ static struct dvb_frontend_ops dvb_dummy_fe_qam_ops = {
        .delsys = { SYS_DVBC_ANNEX_A },
        .info = {
                .name                   = "Dummy DVB-C",
-               .type                   = FE_QAM,
                .frequency_stepsize     = 62500,
                .frequency_min          = 51000000,
                .frequency_max          = 858000000,
@@ -239,7 +237,6 @@ static struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "Dummy DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 250,           /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/ec100.c b/drivers/media/dvb/frontends/ec100.c
index 39e08112c5d116832cc3fbb69e30e87a1dfafb03..c56fddbf53b77b56b5cb9ea4c1ca34e59e6e96d0 100644 (file)
--- a/drivers/media/dvb/frontends/ec100.c
+++ b/drivers/media/dvb/frontends/ec100.c
@@ -309,7 +309,6 @@ static struct dvb_frontend_ops ec100_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "E3C EC100 DVB-T",
-               .type = FE_OFDM,
                .caps =
                        FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |

diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb/frontends/it913x-fe.c
index 754d0f5014c2f551ebd67ca36889ec3b51fe7e00..29cb47eb2f8e30f93a27e1b00eb6d276932584b1 100644 (file)
--- a/drivers/media/dvb/frontends/it913x-fe.c
+++ b/drivers/media/dvb/frontends/it913x-fe.c
@@ -930,7 +930,6 @@ static struct dvb_frontend_ops it913x_fe_ofdm_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "it913x-fe DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 51000000,
                .frequency_max          = 1680000000,
                .frequency_stepsize     = 62500,

diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c
index dc3e42cf0245891cd34ada96ad5e0478588459f9..36fcf559e3619147da5dde357aba6267213357fa 100644 (file)
--- a/drivers/media/dvb/frontends/l64781.c
+++ b/drivers/media/dvb/frontends/l64781.c
@@ -575,7 +575,6 @@ static struct dvb_frontend_ops l64781_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "LSI L64781 DVB-T",
-               .type = FE_OFDM,
        /*      .frequency_min = ???,*/
        /*      .frequency_max = ???,*/
                .frequency_stepsize = 166666,

diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c
index 0b289b27a56155556fc077308821d0eb448f359d..1d2c47378cf856b392534dd2b4599de7d3ac344f 100644 (file)
--- a/drivers/media/dvb/frontends/lgdt3305.c
+++ b/drivers/media/dvb/frontends/lgdt3305.c
@@ -1166,9 +1166,9 @@ fail:
 EXPORT_SYMBOL(lgdt3305_attach);
 
 static struct dvb_frontend_ops lgdt3304_ops = {
+       .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name = "LG Electronics LGDT3304 VSB/QAM Frontend",
-               .type               = FE_ATSC,
                .frequency_min      = 54000000,
                .frequency_max      = 858000000,
                .frequency_stepsize = 62500,
@@ -1191,7 +1191,6 @@ static struct dvb_frontend_ops lgdt3305_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name = "LG Electronics LGDT3305 VSB/QAM Frontend",
-               .type               = FE_ATSC,
                .frequency_min      = 54000000,
                .frequency_max      = 858000000,
                .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 0e6f41b7b125b040647e0eb3fa443fd0c6897f3a..c990d35a13dcdf2617d7efb65d7ea782735b9939 100644 (file)
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -774,7 +774,6 @@ static struct dvb_frontend_ops lgdt3302_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name= "LG Electronics LGDT3302 VSB/QAM Frontend",
-               .type = FE_ATSC,
                .frequency_min= 54000000,
                .frequency_max= 858000000,
                .frequency_stepsize= 62500,
@@ -798,7 +797,6 @@ static struct dvb_frontend_ops lgdt3303_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name= "LG Electronics LGDT3303 VSB/QAM Frontend",
-               .type = FE_ATSC,
                .frequency_min= 54000000,
                .frequency_max= 858000000,
                .frequency_stepsize= 62500,

diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c
index 8f2f43b0ea10c9c0f56e25fdb81ca531963b781a..2cec8041a1068e7f0d7f6cef5a365d68434cfbed 100644 (file)
--- a/drivers/media/dvb/frontends/lgs8gl5.c
+++ b/drivers/media/dvb/frontends/lgs8gl5.c
@@ -415,7 +415,6 @@ static struct dvb_frontend_ops lgs8gl5_ops = {
        .delsys = { SYS_DMBTH },
        .info = {
                .name                   = "Legend Silicon LGS-8GL5 DMB-TH",
-               .type                   = FE_OFDM,
                .frequency_min          = 474000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 10000,

diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c
index a47add29140d331be50f36efae784ce9e6bc2006..4de1d3520cd23b47492591f63ccff4c41196ee13 100644 (file)
--- a/drivers/media/dvb/frontends/lgs8gxx.c
+++ b/drivers/media/dvb/frontends/lgs8gxx.c
@@ -997,7 +997,6 @@ static struct dvb_frontend_ops lgs8gxx_ops = {
        .delsys = { SYS_DMBTH },
        .info = {
                .name = "Legend Silicon LGS8913/LGS8GXX DMB-TH",
-               .type = FE_OFDM,
                .frequency_min = 474000000,
                .frequency_max = 858000000,
                .frequency_stepsize = 10000,

diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
index 45844f4016c862793a5d9ed54b99a89e74a8adf5..9ae40abfd71a170fe6940e372edefb1e0e558720 100644 (file)
--- a/drivers/media/dvb/frontends/mb86a16.c
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -1817,7 +1817,6 @@ static struct dvb_frontend_ops mb86a16_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "Fujitsu MB86A16 DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 3000,

diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index 4267e517d4c4e1c8261b1704d88e53969d2929af..82d3301a1c18229cf050b5bfbcd0fd8dec70c169 100644 (file)
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -617,7 +617,6 @@ static struct dvb_frontend_ops mb86a20s_ops = {
        /* Use dib8000 values per default */
        .info = {
                .name = "Fujitsu mb86A20s",
-               .type = FE_OFDM,
                .caps = FE_CAN_INVERSION_AUTO | FE_CAN_RECOVER |
                        FE_CAN_FEC_1_2  | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |
                        FE_CAN_FEC_5_6  | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |

diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 90aac0d6c36fb654314b6ef90c0cdbbf505c1fdf..e20bf13aa860bb03f2d07945bf04497c6981eb2f 100644 (file)
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -741,7 +741,6 @@ static struct dvb_frontend_ops mt312_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name = "Zarlink ???? DVB-S",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                /* FIXME: adjust freq to real used xtal */

diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index 0321eec894bc3811dd4e76c8169ef0752410c96a..2c3b50e828d7dbe7fa6e3761bc462bfa0f7827bc 100644 (file)
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -570,7 +570,6 @@ static struct dvb_frontend_ops mt352_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Zarlink MT352 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 174000000,
                .frequency_max          = 862000000,
                .frequency_stepsize     = 166667,

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index b541614f11eff90aa1daf59d5ba2876a3309f0d5..49ca78d883b18031ec110a6329be86bf49c9acbe 100644 (file)
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -1206,7 +1206,6 @@ static struct dvb_frontend_ops nxt200x_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name = "Nextwave NXT200X VSB/QAM frontend",
-               .type = FE_ATSC,
                .frequency_min =  54000000,
                .frequency_max = 860000000,
                .frequency_stepsize = 166666,   /* stepsize is just a guess */

diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index 89021bddfcb6f60c398aedda5434a1af1fb3c320..90ae6c72c0e3c085f792820dfbc995e831a588c9 100644 (file)
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -576,7 +576,6 @@ static struct dvb_frontend_ops nxt6000_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "NxtWave NXT6000 DVB-T",
-               .type = FE_OFDM,
                .frequency_min = 0,
                .frequency_max = 863250000,
                .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c
index 82ee29590e7f557bff0b7732b62c5dfd3635af93..5ef921823c1537088dd22914fdcfff41553412a4 100644 (file)
--- a/drivers/media/dvb/frontends/or51132.c
+++ b/drivers/media/dvb/frontends/or51132.c
@@ -589,7 +589,6 @@ static struct dvb_frontend_ops or51132_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name                   = "Oren OR51132 VSB/QAM Frontend",
-               .type                   = FE_ATSC,
                .frequency_min          = 44000000,
                .frequency_max          = 958000000,
                .frequency_stepsize     = 166666,

diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c
index d2b52e555428ea532081e52904709f12011297ab..c625b57b4333e499827ff9e024d98227eda78775 100644 (file)
--- a/drivers/media/dvb/frontends/or51211.c
+++ b/drivers/media/dvb/frontends/or51211.c
@@ -547,7 +547,6 @@ static struct dvb_frontend_ops or51211_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name               = "Oren OR51211 VSB Frontend",
-               .type               = FE_ATSC,
                .frequency_min      = 44000000,
                .frequency_max      = 958000000,
                .frequency_stepsize = 166666,

diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c
index 21baea8902c3098b18b8d4438c1b35f317ebfecd..f71b06221e14c44c93cf934988c21b20fcf3f596 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1409.c
+++ b/drivers/media/dvb/frontends/s5h1409.c
@@ -999,7 +999,6 @@ static struct dvb_frontend_ops s5h1409_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name                   = "Samsung S5H1409 QAM/8VSB Frontend",
-               .type                   = FE_ATSC,
                .frequency_min          = 54000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 62500,

diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c
index b8c7feb51015ff0afbd566d6d8028d65c3c100d4..6cc4b7a9dd60d588c3bc665080eeae68b78c8c21 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1411.c
+++ b/drivers/media/dvb/frontends/s5h1411.c
@@ -918,7 +918,6 @@ static struct dvb_frontend_ops s5h1411_ops = {
        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
        .info = {
                .name                   = "Samsung S5H1411 QAM/8VSB Frontend",
-               .type                   = FE_ATSC,
                .frequency_min          = 54000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 62500,

diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index d83d20acc8734a43911250ea4f6eda1c5f50b7b9..2322257c69ae33bb5af5ed2ea200b82a671ff18a 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -940,7 +940,6 @@ static struct dvb_frontend_ops s5h1420_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name     = "Samsung S5H1420/PnpNetwork PN1010 DVB-S",
-               .type     = FE_QPSK,
                .frequency_min    = 950000,
                .frequency_max    = 2150000,
                .frequency_stepsize = 125,     /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/s5h1432.c b/drivers/media/dvb/frontends/s5h1432.c
index baa3aae160b950b5c9366efd5c59adeb8dd7d274..8352ce1c95563798c06f86e4b0f68bec85c6cd7f 100644 (file)
--- a/drivers/media/dvb/frontends/s5h1432.c
+++ b/drivers/media/dvb/frontends/s5h1432.c
@@ -378,7 +378,6 @@ static struct dvb_frontend_ops s5h1432_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                 .name = "Samsung s5h1432 DVB-T Frontend",
-                .type = FE_OFDM,
                 .frequency_min = 177000000,
                 .frequency_max = 858000000,
                 .frequency_stepsize = 166666,

diff --git a/drivers/media/dvb/frontends/s921.c b/drivers/media/dvb/frontends/s921.c
index 6012e1045d3121c4a815dc9f441ec7da119d2c68..cd2288c07147a7614d7d37ef0022400e6b05d318 100644 (file)
--- a/drivers/media/dvb/frontends/s921.c
+++ b/drivers/media/dvb/frontends/s921.c
@@ -515,7 +515,6 @@ static struct dvb_frontend_ops s921_ops = {
        /* Use dib8000 values per default */
        .info = {
                .name = "Sharp S921",
-               .type = FE_OFDM,
                .frequency_min = 470000000,
                /*
                 * Max should be 770MHz instead, according with Sharp docs,

diff --git a/drivers/media/dvb/frontends/si21xx.c b/drivers/media/dvb/frontends/si21xx.c
index e223f3564433f9168996d4612b56ce9ebc4ce512..a68a64800df77ff7123ae6d18434820d6c95a2b4 100644 (file)
--- a/drivers/media/dvb/frontends/si21xx.c
+++ b/drivers/media/dvb/frontends/si21xx.c
@@ -867,7 +867,6 @@ static struct dvb_frontend_ops si21xx_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "SL SI21XX DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 125,   /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c
index 58e4792e0053f06b2a9b44eeaefa51d82a14096a..e37274c8f14e004c6058c64d053304704f8196ee 100644 (file)
--- a/drivers/media/dvb/frontends/sp8870.c
+++ b/drivers/media/dvb/frontends/sp8870.c
@@ -584,7 +584,6 @@ static struct dvb_frontend_ops sp8870_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Spase SP8870 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 470000000,
                .frequency_max          = 860000000,
                .frequency_stepsize     = 166666,

diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c
index 6fd8513ac5d78df42ff495652b74bf72b6db567f..f4096ccb226e4b76146e001a4d78db1f52d7d756 100644 (file)
--- a/drivers/media/dvb/frontends/sp887x.c
+++ b/drivers/media/dvb/frontends/sp887x.c
@@ -595,7 +595,6 @@ static struct dvb_frontend_ops sp887x_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "Spase SP887x DVB-T",
-               .type = FE_OFDM,
                .frequency_min =  50500000,
                .frequency_max = 858000000,
                .frequency_stepsize = 166666,

diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index c9e178526ed1ac5a87b1f21daafb12ed0bcf7a57..38565beafe23a8594c22d8fbe5bc710fc74dd2f0 100644 (file)
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -1586,26 +1586,10 @@ static enum dvbfe_algo stb0899_frontend_algo(struct dvb_frontend *fe)
        return DVBFE_ALGO_CUSTOM;
 }
 
-static int stb0899_get_property(struct dvb_frontend *fe, struct dtv_property *p)
-{
-       switch (p->cmd) {
-       case DTV_ENUM_DELSYS:
-               p->u.buffer.data[0] = SYS_DSS;
-               p->u.buffer.data[1] = SYS_DVBS;
-               p->u.buffer.data[2] = SYS_DVBS2;
-               p->u.buffer.len = 3;
-               break;
-       default:
-               break;
-       }
-       return 0;
-}
-
 static struct dvb_frontend_ops stb0899_ops = {
-
+       .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
        .info = {
                .name                   = "STB0899 Multistandard",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 0,
@@ -1642,8 +1626,6 @@ static struct dvb_frontend_ops stb0899_ops = {
        .diseqc_send_master_cmd         = stb0899_send_diseqc_msg,
        .diseqc_recv_slave_reply        = stb0899_recv_slave_reply,
        .diseqc_send_burst              = stb0899_send_diseqc_burst,
-
-       .get_property                   = stb0899_get_property,
 };
 
 struct dvb_frontend *stb0899_attach(struct stb0899_config *config, struct i2c_adapter *i2c)

diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c
index b0ddebcc85ed0660b566267b11aea76e63276661..fb5548a82208276281fdfe95e0d1206f8c9f18bd 100644 (file)
--- a/drivers/media/dvb/frontends/stv0288.c
+++ b/drivers/media/dvb/frontends/stv0288.c
@@ -452,12 +452,6 @@ static int stv0288_set_property(struct dvb_frontend *fe, struct dtv_property *p)
        return 0;
 }
 
-static int stv0288_get_property(struct dvb_frontend *fe, struct dtv_property *p)
-{
-       dprintk("%s(..)\n", __func__);
-       return 0;
-}
-
 static int stv0288_set_frontend(struct dvb_frontend *fe)
 {
        struct stv0288_state *state = fe->demodulator_priv;
@@ -545,7 +539,6 @@ static struct dvb_frontend_ops stv0288_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "ST STV0288 DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 1000,  /* kHz for QPSK frontends */
@@ -575,7 +568,6 @@ static struct dvb_frontend_ops stv0288_ops = {
        .set_voltage = stv0288_set_voltage,
 
        .set_property = stv0288_set_property,
-       .get_property = stv0288_get_property,
        .set_frontend = stv0288_set_frontend,
 };
 

diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 8e5bd69f2f8044f248295803c32b88e0db576491..85c157a1fe5eec513623870e8424c4c4d197c280 100644 (file)
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -693,7 +693,6 @@ static struct dvb_frontend_ops stv0297_ops = {
        .delsys = { SYS_DVBC_ANNEX_A },
        .info = {
                 .name = "ST STV0297 DVB-C",
-                .type = FE_QAM,
                 .frequency_min = 47000000,
                 .frequency_max = 862000000,
                 .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c
index a7abc82f08947bbbc7ef14b8cd87b58860a36a16..057b5f8effc0dec16c24f3753329bf8ed354e8bb 100644 (file)
--- a/drivers/media/dvb/frontends/stv0299.c
+++ b/drivers/media/dvb/frontends/stv0299.c
@@ -711,7 +711,6 @@ static struct dvb_frontend_ops stv0299_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "ST STV0299 DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 125,   /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c
index 6786b9e4a86c58dadf187c82ec420b5f61a05a2e..fdd20c7737b57a968d4e5e8edf4d9900ef859d2b 100644 (file)
--- a/drivers/media/dvb/frontends/stv0367.c
+++ b/drivers/media/dvb/frontends/stv0367.c
@@ -2265,7 +2265,6 @@ static struct dvb_frontend_ops stv0367ter_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "ST STV0367 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 47000000,
                .frequency_max          = 862000000,
                .frequency_stepsize     = 15625,
@@ -3384,7 +3383,6 @@ static struct dvb_frontend_ops stv0367cab_ops = {
        .delsys = { SYS_DVBC_ANNEX_A },
        .info = {
                .name = "ST STV0367 DVB-C",
-               .type = FE_QAM,
                .frequency_min = 47000000,
                .frequency_max = 862000000,
                .frequency_stepsize = 62500,

diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c
index 33325ae41b8ab3ab098f060e074e1d2ce5572322..7f1badaf0d03044b2c2e4779ed746e2d03bbae0c 100644 (file)
--- a/drivers/media/dvb/frontends/stv0900_core.c
+++ b/drivers/media/dvb/frontends/stv0900_core.c
@@ -1860,7 +1860,6 @@ static struct dvb_frontend_ops stv0900_ops = {
        .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
        .info = {
                .name                   = "STV0900 frontend",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 125,

diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index dd8ded5fc2dc696a562d6de67e95f2790ea310e8..4aef1877ed422deb38d9dd4f53658f7601b1afdc 100644 (file)
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -4715,7 +4715,6 @@ static struct dvb_frontend_ops stv090x_ops = {
        .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
        .info = {
                .name                   = "STV090x Multistandard",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 0,

diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c
index a3308318f88e036a8eebdb6f4d235bf7a5d47622..1bff7f457e196257136fa71a2790010d5ec370bb 100644 (file)
--- a/drivers/media/dvb/frontends/tda10021.c
+++ b/drivers/media/dvb/frontends/tda10021.c
@@ -487,7 +487,6 @@ static struct dvb_frontend_ops tda10021_ops = {
        .delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },
        .info = {
                .name = "Philips TDA10021 DVB-C",
-               .type = FE_QAM,
                .frequency_stepsize = 62500,
                .frequency_min = 47000000,
                .frequency_max = 862000000,

diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c
index d0b8e86fc879cd85c320446b7be310d92ca84723..ca1e0d54b69afcf343221120f7cb6636962a10d6 100644 (file)
--- a/drivers/media/dvb/frontends/tda10023.c
+++ b/drivers/media/dvb/frontends/tda10023.c
@@ -576,7 +576,6 @@ static struct dvb_frontend_ops tda10023_ops = {
        .delsys = { SYS_DVBC_ANNEX_A, SYS_DVBC_ANNEX_C },
        .info = {
                .name = "Philips TDA10023 DVB-C",
-               .type = FE_QAM,
                .frequency_stepsize = 62500,
                .frequency_min =  47000000,
                .frequency_max = 862000000,

diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c
index 57711cbe28acf56adcc180f9929cfd7036d82ab6..71fb63299de78414d003f507ebca09f2a2b86bb5 100644 (file)
--- a/drivers/media/dvb/frontends/tda10048.c
+++ b/drivers/media/dvb/frontends/tda10048.c
@@ -1160,7 +1160,6 @@ static struct dvb_frontend_ops tda10048_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "NXP TDA10048HN DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 177000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 166666,

diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c
index bbab4a13ff3387e1b0d19be18444c629d0e64f5d..ae6f22aae677e3e0a88988233f380e47e249f47d 100644 (file)
--- a/drivers/media/dvb/frontends/tda1004x.c
+++ b/drivers/media/dvb/frontends/tda1004x.c
@@ -1235,7 +1235,6 @@ static struct dvb_frontend_ops tda10045_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "Philips TDA10045H DVB-T",
-               .type = FE_OFDM,
                .frequency_min = 51000000,
                .frequency_max = 858000000,
                .frequency_stepsize = 166667,
@@ -1306,7 +1305,6 @@ static struct dvb_frontend_ops tda10046_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name = "Philips TDA10046H DVB-T",
-               .type = FE_OFDM,
                .frequency_min = 51000000,
                .frequency_max = 858000000,
                .frequency_stepsize = 166667,

diff --git a/drivers/media/dvb/frontends/tda10071.c b/drivers/media/dvb/frontends/tda10071.c
index 54e2aa0c4f8d5d988cf0e268d8fcbc0c85657bba..a99205026751c6b77c581e31cbcbe58a70e1e60f 100644 (file)
--- a/drivers/media/dvb/frontends/tda10071.c
+++ b/drivers/media/dvb/frontends/tda10071.c
@@ -1218,7 +1218,6 @@ static struct dvb_frontend_ops tda10071_ops = {
        .delsys = { SYS_DVBT, SYS_DVBT2 },
        .info = {
                .name = "NXP TDA10071",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_tolerance = 5000,

diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c
index e0d2fc1031f848e54aefd056aa5296543befe607..fcfe2e080cb042a0ea68e8f1ffb8bbe740ce134c 100644 (file)
--- a/drivers/media/dvb/frontends/tda10086.c
+++ b/drivers/media/dvb/frontends/tda10086.c
@@ -707,7 +707,6 @@ static struct dvb_frontend_ops tda10086_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name     = "Philips TDA10086 DVB-S",
-               .type     = FE_QPSK,
                .frequency_min    = 950000,
                .frequency_max    = 2150000,
                .frequency_stepsize = 125,     /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index b613dfc640ede849601986beef535dc13a8b2190..15912c96926adde19a7fbb7c50663efb146ccdf3 100644 (file)
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -443,7 +443,6 @@ static struct dvb_frontend_ops tda8083_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "Philips TDA8083 DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 920000,     /* TDA8060 */
                .frequency_max          = 2200000,    /* TDA8060 */
                .frequency_stepsize     = 125,   /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index e85a823665ff8485a79b19984c5b001f3ef5c561..bb42b563c42d7761353747f74d682c6ac0999f6b 100644 (file)
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -410,7 +410,6 @@ static struct dvb_frontend_ops ves1820_ops = {
        .delsys = { SYS_DVBC_ANNEX_A },
        .info = {
                .name = "VLSI VES1820 DVB-C",
-               .type = FE_QAM,
                .frequency_stepsize = 62500,
                .frequency_min = 47000000,
                .frequency_max = 862000000,

diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c
index 0ccd8515738f2584fbc5db5b4e5f00b138bba565..9c17eacaec24f738e63028e61cb9d7d3d793c9ba 100644 (file)
--- a/drivers/media/dvb/frontends/ves1x93.c
+++ b/drivers/media/dvb/frontends/ves1x93.c
@@ -513,7 +513,6 @@ static struct dvb_frontend_ops ves1x93_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "VLSI VES1x93 DVB-S",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 125,           /* kHz for QPSK frontends */

diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index 816fa861c0667f4739e6597774a69bcb6811475a..ac7237891374f68456d3c687c4924b11f04b654b 100644 (file)
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -641,7 +641,6 @@ static struct dvb_frontend_ops zl10353_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "Zarlink ZL10353 DVB-T",
-               .type                   = FE_OFDM,
                .frequency_min          = 174000000,
                .frequency_max          = 862000000,
                .frequency_stepsize     = 166667,

diff --git a/drivers/media/dvb/pt1/va1j5jf8007s.c b/drivers/media/dvb/pt1/va1j5jf8007s.c
index ef74440ee98320738926ca53df09fb0ea14c6978..d980dfb21e5e1a2e78887ff51a9e2123c313a3dd 100644 (file)
--- a/drivers/media/dvb/pt1/va1j5jf8007s.c
+++ b/drivers/media/dvb/pt1/va1j5jf8007s.c
@@ -582,7 +582,6 @@ static struct dvb_frontend_ops va1j5jf8007s_ops = {
        .delsys = { SYS_ISDBS },
        .info = {
                .name = "VA1J5JF8007/VA1J5JF8011 ISDB-S",
-               .type = FE_QPSK,
                .frequency_min = 950000,
                .frequency_max = 2150000,
                .frequency_stepsize = 1000,

diff --git a/drivers/media/dvb/pt1/va1j5jf8007t.c b/drivers/media/dvb/pt1/va1j5jf8007t.c
index 6eeabc8d4c7013ded2e7c3f3738febcd307ac186..2db15159d514daf498791e668a4eab8cd1a91c7d 100644 (file)
--- a/drivers/media/dvb/pt1/va1j5jf8007t.c
+++ b/drivers/media/dvb/pt1/va1j5jf8007t.c
@@ -431,7 +431,6 @@ static struct dvb_frontend_ops va1j5jf8007t_ops = {
        .delsys = { SYS_ISDBT },
        .info = {
                .name = "VA1J5JF8007/VA1J5JF8011 ISDB-T",
-               .type = FE_OFDM,
                .frequency_min = 90000000,
                .frequency_max = 770000000,
                .frequency_stepsize = 142857,

diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index 198cc0e3ca40f64fe45e8e85828f7d540b03b756..654685c9303e58e8eff7edd15c50aae0c6daeaec 100644 (file)
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -786,7 +786,6 @@ static void smsdvb_release(struct dvb_frontend *fe)
 static struct dvb_frontend_ops smsdvb_fe_ops = {
        .info = {
                .name                   = "Siano Mobile Digital MDTV Receiver",
-               .type                   = FE_OFDM,
                .frequency_min          = 44250000,
                .frequency_max          = 867250000,
                .frequency_stepsize     = 250000,

diff --git a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
index a498f5a70bd02908a915878070adef05ba776119..5c45c9d0712ddf949f0ac571b5649111585046ae 100644 (file)
--- a/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
+++ b/drivers/media/dvb/ttusb-dec/ttusbdecfe.c
@@ -246,7 +246,6 @@ static struct dvb_frontend_ops ttusbdecfe_dvbt_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name                   = "TechnoTrend/Hauppauge DEC2000-t Frontend",
-               .type                   = FE_OFDM,
                .frequency_min          = 51000000,
                .frequency_max          = 858000000,
                .frequency_stepsize     = 62500,
@@ -270,7 +269,6 @@ static struct dvb_frontend_ops ttusbdecfe_dvbs_ops = {
        .delsys = { SYS_DVBS },
        .info = {
                .name                   = "TechnoTrend/Hauppauge DEC3000-s Frontend",
-               .type                   = FE_QPSK,
                .frequency_min          = 950000,
                .frequency_max          = 2150000,
                .frequency_stepsize     = 125,

diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/video/tlg2300/pd-dvb.c
index d7aac423a66f81d714f96a102b3d11af0b7f325f..30fcb117e89899a25208428061900d22eefb829c 100644 (file)
--- a/drivers/media/video/tlg2300/pd-dvb.c
+++ b/drivers/media/video/tlg2300/pd-dvb.c
@@ -335,7 +335,6 @@ static struct dvb_frontend_ops poseidon_frontend_ops = {
        .delsys = { SYS_DVBT },
        .info = {
                .name           = "Poseidon DVB-T",
-               .type           = FE_OFDM,
                .frequency_min  = 174000000,
                .frequency_max  = 862000000,
                .frequency_stepsize       = 62500,/* FIXME */