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

60 files changed, 2 insertions, 93 deletions

diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c
index e6ba3e014cb4..d4227c63986c 100644
--- 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 ff86074d3b87..a2261ea2cf82 100644
--- 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 762cd5e62fae..c688b95df486 100644
--- 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 a53f83acb386..033cd7ad3ca2 100644
--- 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 a5b1521d238d..f2a90f990ce3 100644
--- 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 a0dcbd6b424a..faba82485086 100644
--- 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 2f07c494e7fe..5101f10f2d7a 100644
--- 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 e29de1ca9855..b48879186537 100644
--- 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 ad5d1a450b09..7e28b4ee7d4f 100644
--- 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 07c1a956b771..93e1b12e7907 100644
--- 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 a1c5bdbab690..af91e0c92339 100644
--- 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 e500b8965a5f..ffad181a9692 100644
--- 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 2a2d6466ecc5..148bf79236fb 100644
--- 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 361bdb18e3b2..5ceadc285b3a 100644
--- 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 fe07d74a1f1e..9ca34f495009 100644
--- 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 2312b4d20d4a..863ef3cfab9f 100644
--- 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 252062040488..7bf39cda83c5 100644
--- 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 36e1c82e385c..67a1e39d1eab 100644
--- 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 c6a43c49e728..938777065de6 100644
--- 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 ac4c8d2221d0..dcfc902c8678 100644
--- 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 39e08112c5d1..c56fddbf53b7 100644
--- 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 754d0f5014c2..29cb47eb2f8e 100644
--- 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 dc3e42cf0245..36fcf559e361 100644
--- 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 0b289b27a561..1d2c47378cf8 100644
--- 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 0e6f41b7b125..c990d35a13dc 100644
--- 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 8f2f43b0ea10..2cec8041a106 100644
--- 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 a47add29140d..4de1d3520cd2 100644
--- 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 45844f4016c8..9ae40abfd71a 100644
--- 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 4267e517d4c4..82d3301a1c18 100644
--- 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 90aac0d6c36f..e20bf13aa860 100644
--- 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 0321eec894bc..2c3b50e828d7 100644
--- 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 b541614f11ef..49ca78d883b1 100644
--- 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 89021bddfcb6..90ae6c72c0e3 100644
--- 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 82ee29590e7f..5ef921823c15 100644
--- 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 d2b52e555428..c625b57b4333 100644
--- 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 21baea8902c3..f71b06221e14 100644
--- 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 b8c7feb51015..6cc4b7a9dd60 100644
--- 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 d83d20acc873..2322257c69ae 100644
--- 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 baa3aae160b9..8352ce1c9556 100644
--- 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 6012e1045d31..cd2288c07147 100644
--- 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 e223f3564433..a68a64800df7 100644
--- 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 58e4792e0053..e37274c8f14e 100644
--- 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 6fd8513ac5d7..f4096ccb226e 100644
--- 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 c9e178526ed1..38565beafe23 100644
--- 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 b0ddebcc85ed..fb5548a82208 100644
--- 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 8e5bd69f2f80..85c157a1fe5e 100644
--- 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 a7abc82f0894..057b5f8effc0 100644
--- 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 6786b9e4a86c..fdd20c7737b5 100644
--- 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 33325ae41b8a..7f1badaf0d03 100644
--- 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 dd8ded5fc2dc..4aef1877ed42 100644
--- 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 a3308318f88e..1bff7f457e19 100644
--- 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 d0b8e86fc879..ca1e0d54b69a 100644
--- 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 57711cbe28ac..71fb63299de7 100644
--- 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 bbab4a13ff33..ae6f22aae677 100644
--- 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 54e2aa0c4f8d..a99205026751 100644
--- 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 e0d2fc1031f8..fcfe2e080cb0 100644
--- 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 b613dfc640ed..15912c96926a 100644
--- 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 e85a823665ff..bb42b563c42d 100644
--- 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 0ccd8515738f..9c17eacaec24 100644
--- 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 816fa861c066..ac7237891374 100644
--- 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,