1 files changed, 8 insertions, 9 deletions

diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index eac20650499f..49ca78d883b1 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -528,9 +528,9 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware
         return 0;
 };
 
-static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
-                                             struct dvb_frontend_parameters *p)
+static int nxt200x_setup_frontend_parameters(struct dvb_frontend *fe)
 {
+        struct dtv_frontend_properties *p = &fe->dtv_property_cache;
         struct nxt200x_state* state = fe->demodulator_priv;
         u8 buf[5];
 
@@ -546,7 +546,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
         }
 
         /* set additional params */
-        switch (p->u.vsb.modulation) {
+        switch (p->modulation) {
                 case QAM_64:
                 case QAM_256:
                         /* Set punctured clock for QAM */
@@ -566,7 +566,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
 
         if (fe->ops.tuner_ops.calc_regs) {
                 /* get tuning information */
-                fe->ops.tuner_ops.calc_regs(fe, p, buf, 5);
+                fe->ops.tuner_ops.calc_regs(fe, buf, 5);
 
                 /* write frequency information */
                 nxt200x_writetuner(state, buf);
@@ -576,7 +576,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
         nxt200x_agc_reset(state);
 
         /* set target power level */
-        switch (p->u.vsb.modulation) {
+        switch (p->modulation) {
                 case QAM_64:
                 case QAM_256:
                         buf[0] = 0x74;
@@ -620,7 +620,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
         }
 
         /* write sdmx input */
-        switch (p->u.vsb.modulation) {
+        switch (p->modulation) {
                 case QAM_64:
                                 buf[0] = 0x68;
                                 break;
@@ -714,7 +714,7 @@ static int nxt200x_setup_frontend_parameters (struct dvb_frontend* fe,
         }
 
         /* write agc ucgp0 */
-        switch (p->u.vsb.modulation) {
+        switch (p->modulation) {
                 case QAM_64:
                                 buf[0] = 0x02;
                                 break;
@@ -1203,10 +1203,9 @@ error:
 }
 
 static struct dvb_frontend_ops nxt200x_ops = {
-
+        .delsys = { SYS_ATSC, SYS_DVBC_ANNEX_B },
         .info = {
                 .name = "Nextwave NXT200X VSB/QAM frontend",
-                .type = FE_ATSC,
                 .frequency_min =  54000000,
                 .frequency_max = 860000000,
                 .frequency_stepsize = 166666,   /* stepsize is just a guess */