[media] dvb: remove dvb_frontend_parameters from calc_regs()

The calc_regs() callback is used by a few frontends (mt352, nxt200x,
digitv and zl10353). On all places it is called, the parameters are
set by DVBv5 way. So, just use the DVBv5 struct and remove the
extra parameter.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

4 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c
index c19d6bbc68ce..f967cf9b4a60 100644
--- a/drivers/media/dvb/frontends/dvb-pll.c
+++ b/drivers/media/dvb/frontends/dvb-pll.c
@@ -647,9 +647,9 @@ static int dvb_pll_set_params(struct dvb_frontend *fe,
 }
 
 static int dvb_pll_calc_regs(struct dvb_frontend *fe,
-                             struct dvb_frontend_parameters *params,
                              u8 *buf, int buf_len)
 {
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         struct dvb_pll_priv *priv = fe->tuner_priv;
         int result;
         u32 frequency = 0;
@@ -657,7 +657,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
         if (buf_len < 5)
                 return -EINVAL;
 
-        result = dvb_pll_configure(fe, buf + 1, params->frequency);
+        result = dvb_pll_configure(fe, buf + 1, c->frequency);
         if (result < 0)
                 return result;
         else
@@ -666,7 +666,7 @@ static int dvb_pll_calc_regs(struct dvb_frontend *fe,
         buf[0] = priv->pll_i2c_address;
 
         priv->frequency = frequency;
-        priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
+        priv->bandwidth = c->bandwidth_hz;
 
         return 5;
 }
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c
index 319672f8e1a7..e2a86daba502 100644
--- a/drivers/media/dvb/frontends/mt352.c
+++ b/drivers/media/dvb/frontends/mt352.c
@@ -302,7 +302,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe,
                 _mt352_write(fe, fsm_go, 2);
         } else {
                 if (fe->ops.tuner_ops.calc_regs) {
-                        fe->ops.tuner_ops.calc_regs(fe, param, buf+8, 5);
+                        fe->ops.tuner_ops.calc_regs(fe, buf+8, 5);
                         buf[8] <<= 1;
                         _mt352_write(fe, buf, sizeof(buf));
                         _mt352_write(fe, tuner_go, 2);
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c
index eac20650499f..ae5c3c32f407 100644
--- a/drivers/media/dvb/frontends/nxt200x.c
+++ b/drivers/media/dvb/frontends/nxt200x.c
@@ -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);
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index adbbf6d3d044..9caccc03d588 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -367,7 +367,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe,
                                 fe->ops.i2c_gate_ctrl(fe, 0);
                 }
         } else if (fe->ops.tuner_ops.calc_regs) {
-                fe->ops.tuner_ops.calc_regs(fe, param, pllbuf + 1, 5);
+                fe->ops.tuner_ops.calc_regs(fe, pllbuf + 1, 5);
                 pllbuf[1] <<= 1;
                 zl10353_write(fe, pllbuf, sizeof(pllbuf));
         }