1 files changed, 19 insertions, 13 deletions

diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c
index 6599b8fea9e9..90ae6c72c0e3 100644
--- a/drivers/media/dvb/frontends/nxt6000.c
+++ b/drivers/media/dvb/frontends/nxt6000.c
@@ -81,22 +81,21 @@ static void nxt6000_reset(struct nxt6000_state* state)
         nxt6000_writereg(state, OFDM_COR_CTL, val | COREACT);
 }
 
-static int nxt6000_set_bandwidth(struct nxt6000_state* state, fe_bandwidth_t bandwidth)
+static int nxt6000_set_bandwidth(struct nxt6000_state *state, u32 bandwidth)
 {
         u16 nominal_rate;
         int result;
 
         switch (bandwidth) {
-
-        case BANDWIDTH_6_MHZ:
+        case 6000000:
                 nominal_rate = 0x55B7;
                 break;
 
-        case BANDWIDTH_7_MHZ:
+        case 7000000:
                 nominal_rate = 0x6400;
                 break;
 
-        case BANDWIDTH_8_MHZ:
+        case 8000000:
                 nominal_rate = 0x7249;
                 break;
 
@@ -457,23 +456,31 @@ static int nxt6000_init(struct dvb_frontend* fe)
         return 0;
 }
 
-static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *param)
+static int nxt6000_set_frontend(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct nxt6000_state* state = fe->demodulator_priv;
         int result;
 
         if (fe->ops.tuner_ops.set_params) {
-                fe->ops.tuner_ops.set_params(fe, param);
+                fe->ops.tuner_ops.set_params(fe);
                 if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0);
         }
 
-        if ((result = nxt6000_set_bandwidth(state, param->u.ofdm.bandwidth)) < 0)
+        result = nxt6000_set_bandwidth(state, p->bandwidth_hz);
+        if (result < 0)
                 return result;
-        if ((result = nxt6000_set_guard_interval(state, param->u.ofdm.guard_interval)) < 0)
+
+        result = nxt6000_set_guard_interval(state, p->guard_interval);
+        if (result < 0)
                 return result;
-        if ((result = nxt6000_set_transmission_mode(state, param->u.ofdm.transmission_mode)) < 0)
+
+        result = nxt6000_set_transmission_mode(state, p->transmission_mode);
+        if (result < 0)
                 return result;
-        if ((result = nxt6000_set_inversion(state, param->inversion)) < 0)
+
+        result = nxt6000_set_inversion(state, p->inversion);
+        if (result < 0)
                 return result;
 
         msleep(500);
@@ -566,10 +573,9 @@ error:
 }
 
 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,