1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index bf9c999aa470..5101f10f2d7a 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -531,26 +531,27 @@ static int cx24110_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24110_set_frontend(struct dvb_frontend *fe)
 {
         struct cx24110_state *state = fe->demodulator_priv;
-
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
 
         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);
         }
 
-        cx24110_set_inversion (state, p->inversion);
-        cx24110_set_fec (state, p->u.qpsk.fec_inner);
-        cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate);
+        cx24110_set_inversion(state, p->inversion);
+        cx24110_set_fec(state, p->fec_inner);
+        cx24110_set_symbolrate(state, p->symbol_rate);
         cx24110_writereg(state,0x04,0x05); /* start acquisition */
 
         return 0;
 }
 
-static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int cx24110_get_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct cx24110_state *state = fe->demodulator_priv;
         s32 afc; unsigned sclk;
 
@@ -571,7 +572,7 @@ static int cx24110_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         p->frequency += afc;
         p->inversion = (cx24110_readreg (state, 0x22) & 0x10) ?
                                 INVERSION_ON : INVERSION_OFF;
-        p->u.qpsk.fec_inner = cx24110_get_fec (state);
+        p->fec_inner = cx24110_get_fec(state);
 
         return 0;
 }
@@ -623,10 +624,9 @@ error:
 }
 
 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 */