1 files changed, 20 insertions, 22 deletions

diff --git a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
index d1f58371c71..d83df4bb72d 100644
--- a/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
+++ b/drivers/media/dvb/dvb-usb/mxl111sf-demod.c
@@ -102,8 +102,8 @@ fail:
 }
 
 static
-int mxl1x1sf_demod_get_tps_constellation(struct mxl111sf_demod_state *state,
-                                         fe_modulation_t *constellation)
+int mxl1x1sf_demod_get_tps_modulation(struct mxl111sf_demod_state *state,
+                                         fe_modulation_t *modulation)
 {
         u8 val;
         int ret = mxl111sf_demod_read_reg(state, V6_MODORDER_TPS_REG, &val);
@@ -113,13 +113,13 @@ int mxl1x1sf_demod_get_tps_constellation(struct mxl111sf_demod_state *state,
 
         switch ((val & V6_PARAM_CONSTELLATION_MASK) >> 4) {
         case 0:
-                *constellation = QPSK;
+                *modulation = QPSK;
                 break;
         case 1:
-                *constellation = QAM_16;
+                *modulation = QAM_16;
                 break;
         case 2:
-                *constellation = QAM_64;
+                *modulation = QAM_64;
                 break;
         }
 fail:
@@ -284,8 +284,7 @@ static int mxl1x1sf_demod_reset_irq_status(struct mxl111sf_demod_state *state)
 
 /* ------------------------------------------------------------------------ */
 
-static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,
-                                       struct dvb_frontend_parameters *param)
+static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe)
 {
         struct mxl111sf_demod_state *state = fe->demodulator_priv;
         int ret = 0;
@@ -303,7 +302,7 @@ static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,
         mxl_dbg("()");
 
         if (fe->ops.tuner_ops.set_params) {
-                ret = fe->ops.tuner_ops.set_params(fe, param);
+                ret = fe->ops.tuner_ops.set_params(fe);
                 if (mxl_fail(ret))
                         goto fail;
                 msleep(50);
@@ -481,13 +480,13 @@ static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,
                                                u16 *signal_strength)
 {
         struct mxl111sf_demod_state *state = fe->demodulator_priv;
-        fe_modulation_t constellation;
+        fe_modulation_t modulation;
         u16 snr;
 
         mxl111sf_demod_calc_snr(state, &snr);
-        mxl1x1sf_demod_get_tps_constellation(state, &constellation);
+        mxl1x1sf_demod_get_tps_modulation(state, &modulation);
 
-        switch (constellation) {
+        switch (modulation) {
         case QPSK:
                 *signal_strength = (snr >= 1300) ?
                         min(65535, snr * 44) : snr * 38;
@@ -508,9 +507,9 @@ static int mxl111sf_demod_read_signal_strength(struct dvb_frontend *fe,
         return 0;
 }
 
-static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,
-                                       struct dvb_frontend_parameters *p)
+static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct mxl111sf_demod_state *state = fe->demodulator_priv;
 
         mxl_dbg("()");
@@ -518,18 +517,18 @@ static int mxl111sf_demod_get_frontend(struct dvb_frontend *fe,
         p->inversion = /* FIXME */ ? INVERSION_ON : INVERSION_OFF;
 #endif
         if (fe->ops.tuner_ops.get_bandwidth)
-                fe->ops.tuner_ops.get_bandwidth(fe, &p->u.ofdm.bandwidth);
+                fe->ops.tuner_ops.get_bandwidth(fe, &p->bandwidth_hz);
         if (fe->ops.tuner_ops.get_frequency)
                 fe->ops.tuner_ops.get_frequency(fe, &p->frequency);
-        mxl1x1sf_demod_get_tps_code_rate(state, &p->u.ofdm.code_rate_HP);
-        mxl1x1sf_demod_get_tps_code_rate(state, &p->u.ofdm.code_rate_LP);
-        mxl1x1sf_demod_get_tps_constellation(state, &p->u.ofdm.constellation);
+        mxl1x1sf_demod_get_tps_code_rate(state, &p->code_rate_HP);
+        mxl1x1sf_demod_get_tps_code_rate(state, &p->code_rate_LP);
+        mxl1x1sf_demod_get_tps_modulation(state, &p->modulation);
         mxl1x1sf_demod_get_tps_guard_fft_mode(state,
-                                              &p->u.ofdm.transmission_mode);
+                                              &p->transmission_mode);
         mxl1x1sf_demod_get_tps_guard_interval(state,
-                                              &p->u.ofdm.guard_interval);
+                                              &p->guard_interval);
         mxl1x1sf_demod_get_tps_hierarchy(state,
-                                         &p->u.ofdm.hierarchy_information);
+                                         &p->hierarchy);
 
         return 0;
 }
@@ -551,10 +550,9 @@ static void mxl111sf_demod_release(struct dvb_frontend *fe)
 }
 
 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,