1 files changed, 12 insertions, 11 deletions

diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c
index 550a07a8a997..bb42b563c42d 100644
--- a/drivers/media/dvb/frontends/ves1820.c
+++ b/drivers/media/dvb/frontends/ves1820.c
@@ -205,25 +205,26 @@ static int ves1820_init(struct dvb_frontend* fe)
         return 0;
 }
 
-static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int ves1820_set_parameters(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct ves1820_state* state = fe->demodulator_priv;
         static const u8 reg0x00[] = { 0x00, 0x04, 0x08, 0x0c, 0x10 };
         static const u8 reg0x01[] = { 140, 140, 106, 100, 92 };
         static const u8 reg0x05[] = { 135, 100, 70, 54, 38 };
         static const u8 reg0x08[] = { 162, 116, 67, 52, 35 };
         static const u8 reg0x09[] = { 145, 150, 106, 126, 107 };
-        int real_qam = p->u.qam.modulation - QAM_16;
+        int real_qam = p->modulation - QAM_16;
 
         if (real_qam < 0 || real_qam > 4)
                 return -EINVAL;
 
         if (fe->ops.tuner_ops.set_params) {
-                fe->ops.tuner_ops.set_params(fe, p);
+                fe->ops.tuner_ops.set_params(fe);
                 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
-        ves1820_set_symbolrate(state, p->u.qam.symbol_rate);
+        ves1820_set_symbolrate(state, p->symbol_rate);
         ves1820_writereg(state, 0x34, state->pwm);
 
         ves1820_writereg(state, 0x01, reg0x01[real_qam]);
@@ -309,8 +310,9 @@ static int ves1820_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int ves1820_get_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct ves1820_state* state = fe->demodulator_priv;
         int sync;
         s8 afc = 0;
@@ -320,7 +322,7 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         if (verbose) {
                 /* AFC only valid when carrier has been recovered */
                 printk(sync & 2 ? "ves1820: AFC (%d) %dHz\n" :
-                        "ves1820: [AFC (%d) %dHz]\n", afc, -((s32) p->u.qam.symbol_rate * afc) >> 10);
+                        "ves1820: [AFC (%d) %dHz]\n", afc, -((s32) p->symbol_rate * afc) >> 10);
         }
 
         if (!state->config->invert) {
@@ -329,13 +331,13 @@ static int ves1820_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
                 p->inversion = (!(state->reg0 & 0x20)) ? INVERSION_ON : INVERSION_OFF;
         }
 
-        p->u.qam.modulation = ((state->reg0 >> 2) & 7) + QAM_16;
+        p->modulation = ((state->reg0 >> 2) & 7) + QAM_16;
 
-        p->u.qam.fec_inner = FEC_NONE;
+        p->fec_inner = FEC_NONE;
 
         p->frequency = ((p->frequency + 31250) / 62500) * 62500;
         if (sync & 2)
-                p->frequency -= ((s32) p->u.qam.symbol_rate * afc) >> 10;
+                p->frequency -= ((s32) p->symbol_rate * afc) >> 10;
 
         return 0;
 }
@@ -405,10 +407,9 @@ error:
 }
 
 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,