1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c
index 9369f7442f27..15912c96926a 100644
--- a/drivers/media/dvb/frontends/tda8083.c
+++ b/drivers/media/dvb/frontends/tda8083.c
@@ -315,18 +315,19 @@ static int tda8083_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)
         return 0;
 }
 
-static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int tda8083_set_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda8083_state* state = fe->demodulator_priv;
 
         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);
         }
 
         tda8083_set_inversion (state, p->inversion);
-        tda8083_set_fec (state, p->u.qpsk.fec_inner);
-        tda8083_set_symbolrate (state, p->u.qpsk.symbol_rate);
+        tda8083_set_fec(state, p->fec_inner);
+        tda8083_set_symbolrate(state, p->symbol_rate);
 
         tda8083_writereg (state, 0x00, 0x3c);
         tda8083_writereg (state, 0x00, 0x04);
@@ -334,16 +335,17 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
         return 0;
 }
 
-static int tda8083_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p)
+static int tda8083_get_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct tda8083_state* state = fe->demodulator_priv;
 
         /*  FIXME: get symbolrate & frequency offset...*/
         /*p->frequency = ???;*/
         p->inversion = (tda8083_readreg (state, 0x0e) & 0x80) ?
                         INVERSION_ON : INVERSION_OFF;
-        p->u.qpsk.fec_inner = tda8083_get_fec (state);
-        /*p->u.qpsk.symbol_rate = tda8083_get_symbolrate (state);*/
+        p->fec_inner = tda8083_get_fec(state);
+        /*p->symbol_rate = tda8083_get_symbolrate (state);*/
 
         return 0;
 }
@@ -438,10 +440,9 @@ error:
 }
 
 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 */