diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-24 10:24:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-12-31 05:57:29 -0500 |
commit | 14d24d148c7521b2b88b396652e36f55d061e195 (patch) | |
tree | 268de8276d43e4912030792d42996d9652eaada0 /drivers/media/dvb/frontends | |
parent | 249fa0b01c82f497efa15cb98081183e8938985f (diff) |
[media] tuners: remove dvb_frontend_parameters from set_params()
This is a big patch, yet trivial: now that all tuners use the DVBv5
way to pass parameters (e. g. via fe->dtv_property_cache), the
extra parameter can be removed from set_params() call.
After this change, very few DVBv3 specific stuff are left at the
tuners.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends')
66 files changed, 71 insertions, 80 deletions
diff --git a/drivers/media/dvb/frontends/af9013.c b/drivers/media/dvb/frontends/af9013.c index 77862fe2c65e..94df6cc6f537 100644 --- a/drivers/media/dvb/frontends/af9013.c +++ b/drivers/media/dvb/frontends/af9013.c | |||
@@ -587,7 +587,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe, | |||
587 | 587 | ||
588 | /* program tuner */ | 588 | /* program tuner */ |
589 | if (fe->ops.tuner_ops.set_params) | 589 | if (fe->ops.tuner_ops.set_params) |
590 | fe->ops.tuner_ops.set_params(fe, p); | 590 | fe->ops.tuner_ops.set_params(fe); |
591 | 591 | ||
592 | /* program CFOE coefficients */ | 592 | /* program CFOE coefficients */ |
593 | if (c->bandwidth_hz != state->bandwidth_hz) { | 593 | if (c->bandwidth_hz != state->bandwidth_hz) { |
diff --git a/drivers/media/dvb/frontends/atbm8830.c b/drivers/media/dvb/frontends/atbm8830.c index 1539ea1f81ac..90480d3d6fdf 100644 --- a/drivers/media/dvb/frontends/atbm8830.c +++ b/drivers/media/dvb/frontends/atbm8830.c | |||
@@ -279,7 +279,7 @@ static int atbm8830_set_fe(struct dvb_frontend *fe, | |||
279 | if (fe->ops.tuner_ops.set_params) { | 279 | if (fe->ops.tuner_ops.set_params) { |
280 | if (fe->ops.i2c_gate_ctrl) | 280 | if (fe->ops.i2c_gate_ctrl) |
281 | fe->ops.i2c_gate_ctrl(fe, 1); | 281 | fe->ops.i2c_gate_ctrl(fe, 1); |
282 | fe->ops.tuner_ops.set_params(fe, fe_params); | 282 | fe->ops.tuner_ops.set_params(fe); |
283 | if (fe->ops.i2c_gate_ctrl) | 283 | if (fe->ops.i2c_gate_ctrl) |
284 | fe->ops.i2c_gate_ctrl(fe, 0); | 284 | fe->ops.i2c_gate_ctrl(fe, 0); |
285 | } | 285 | } |
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c index 5c0d3989f5bd..1df9d9c4a259 100644 --- a/drivers/media/dvb/frontends/au8522_dig.c +++ b/drivers/media/dvb/frontends/au8522_dig.c | |||
@@ -596,7 +596,7 @@ static int au8522_set_frontend(struct dvb_frontend *fe, | |||
596 | if (fe->ops.tuner_ops.set_params) { | 596 | if (fe->ops.tuner_ops.set_params) { |
597 | if (fe->ops.i2c_gate_ctrl) | 597 | if (fe->ops.i2c_gate_ctrl) |
598 | fe->ops.i2c_gate_ctrl(fe, 1); | 598 | fe->ops.i2c_gate_ctrl(fe, 1); |
599 | ret = fe->ops.tuner_ops.set_params(fe, p); | 599 | ret = fe->ops.tuner_ops.set_params(fe); |
600 | if (fe->ops.i2c_gate_ctrl) | 600 | if (fe->ops.i2c_gate_ctrl) |
601 | fe->ops.i2c_gate_ctrl(fe, 0); | 601 | fe->ops.i2c_gate_ctrl(fe, 0); |
602 | } | 602 | } |
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h index e008946011b2..53e4d0dbb745 100644 --- a/drivers/media/dvb/frontends/bsbe1.h +++ b/drivers/media/dvb/frontends/bsbe1.h | |||
@@ -69,7 +69,7 @@ static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ra | |||
69 | return 0; | 69 | return 0; |
70 | } | 70 | } |
71 | 71 | ||
72 | static int alps_bsbe1_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 72 | static int alps_bsbe1_tuner_set_params(struct dvb_frontend *fe) |
73 | { | 73 | { |
74 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 74 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
75 | int ret; | 75 | int ret; |
diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h index e59544d3b846..c2a578e1314d 100644 --- a/drivers/media/dvb/frontends/bsru6.h +++ b/drivers/media/dvb/frontends/bsru6.h | |||
@@ -101,7 +101,7 @@ static int alps_bsru6_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ra | |||
101 | return 0; | 101 | return 0; |
102 | } | 102 | } |
103 | 103 | ||
104 | static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 104 | static int alps_bsru6_tuner_set_params(struct dvb_frontend *fe) |
105 | { | 105 | { |
106 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 106 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
107 | u8 buf[4]; | 107 | u8 buf[4]; |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index 0142214b0133..6ef82a1a15ef 100644 --- a/drivers/media/dvb/frontends/cx22700.c +++ b/drivers/media/dvb/frontends/cx22700.c | |||
@@ -326,7 +326,7 @@ static int cx22700_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
326 | cx22700_writereg (state, 0x00, 0x00); | 326 | cx22700_writereg (state, 0x00, 0x00); |
327 | 327 | ||
328 | if (fe->ops.tuner_ops.set_params) { | 328 | if (fe->ops.tuner_ops.set_params) { |
329 | fe->ops.tuner_ops.set_params(fe, p); | 329 | fe->ops.tuner_ops.set_params(fe); |
330 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 330 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
331 | } | 331 | } |
332 | 332 | ||
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index 3139558148ba..73dd87ae5b3e 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -267,7 +267,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe, | |||
267 | struct cx22702_state *state = fe->demodulator_priv; | 267 | struct cx22702_state *state = fe->demodulator_priv; |
268 | 268 | ||
269 | if (fe->ops.tuner_ops.set_params) { | 269 | if (fe->ops.tuner_ops.set_params) { |
270 | fe->ops.tuner_ops.set_params(fe, p); | 270 | fe->ops.tuner_ops.set_params(fe); |
271 | if (fe->ops.i2c_gate_ctrl) | 271 | if (fe->ops.i2c_gate_ctrl) |
272 | fe->ops.i2c_gate_ctrl(fe, 0); | 272 | fe->ops.i2c_gate_ctrl(fe, 0); |
273 | } | 273 | } |
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c index bf9c999aa470..1eb9253c7bc3 100644 --- a/drivers/media/dvb/frontends/cx24110.c +++ b/drivers/media/dvb/frontends/cx24110.c | |||
@@ -537,7 +537,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
537 | 537 | ||
538 | 538 | ||
539 | if (fe->ops.tuner_ops.set_params) { | 539 | if (fe->ops.tuner_ops.set_params) { |
540 | fe->ops.tuner_ops.set_params(fe, p); | 540 | fe->ops.tuner_ops.set_params(fe); |
541 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 541 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
542 | } | 542 | } |
543 | 543 | ||
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c index 07737e2f7131..4b8794fa992d 100644 --- a/drivers/media/dvb/frontends/cx24113.c +++ b/drivers/media/dvb/frontends/cx24113.c | |||
@@ -476,8 +476,7 @@ static int cx24113_init(struct dvb_frontend *fe) | |||
476 | return ret; | 476 | return ret; |
477 | } | 477 | } |
478 | 478 | ||
479 | static int cx24113_set_params(struct dvb_frontend *fe, | 479 | static int cx24113_set_params(struct dvb_frontend *fe) |
480 | struct dvb_frontend_parameters *p) | ||
481 | { | 480 | { |
482 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 481 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
483 | struct cx24113_state *state = fe->tuner_priv; | 482 | struct cx24113_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c index b1dd8acc607a..4d387d3e24d6 100644 --- a/drivers/media/dvb/frontends/cx24123.c +++ b/drivers/media/dvb/frontends/cx24123.c | |||
@@ -945,7 +945,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe, | |||
945 | if (!state->config->dont_use_pll) | 945 | if (!state->config->dont_use_pll) |
946 | cx24123_pll_tune(fe, p); | 946 | cx24123_pll_tune(fe, p); |
947 | else if (fe->ops.tuner_ops.set_params) | 947 | else if (fe->ops.tuner_ops.set_params) |
948 | fe->ops.tuner_ops.set_params(fe, p); | 948 | fe->ops.tuner_ops.set_params(fe); |
949 | else | 949 | else |
950 | err("it seems I don't have a tuner..."); | 950 | err("it seems I don't have a tuner..."); |
951 | 951 | ||
diff --git a/drivers/media/dvb/frontends/cxd2820r_c.c b/drivers/media/dvb/frontends/cxd2820r_c.c index bc13db4ef224..9d081efcc646 100644 --- a/drivers/media/dvb/frontends/cxd2820r_c.c +++ b/drivers/media/dvb/frontends/cxd2820r_c.c | |||
@@ -57,7 +57,7 @@ int cxd2820r_set_frontend_c(struct dvb_frontend *fe, | |||
57 | 57 | ||
58 | /* program tuner */ | 58 | /* program tuner */ |
59 | if (fe->ops.tuner_ops.set_params) | 59 | if (fe->ops.tuner_ops.set_params) |
60 | fe->ops.tuner_ops.set_params(fe, params); | 60 | fe->ops.tuner_ops.set_params(fe); |
61 | 61 | ||
62 | if (priv->delivery_system != SYS_DVBC_ANNEX_A) { | 62 | if (priv->delivery_system != SYS_DVBC_ANNEX_A) { |
63 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 63 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/cxd2820r_t.c b/drivers/media/dvb/frontends/cxd2820r_t.c index 4ce0576c87e4..d0b854a911e6 100644 --- a/drivers/media/dvb/frontends/cxd2820r_t.c +++ b/drivers/media/dvb/frontends/cxd2820r_t.c | |||
@@ -81,7 +81,7 @@ int cxd2820r_set_frontend_t(struct dvb_frontend *fe, | |||
81 | 81 | ||
82 | /* program tuner */ | 82 | /* program tuner */ |
83 | if (fe->ops.tuner_ops.set_params) | 83 | if (fe->ops.tuner_ops.set_params) |
84 | fe->ops.tuner_ops.set_params(fe, p); | 84 | fe->ops.tuner_ops.set_params(fe); |
85 | 85 | ||
86 | if (priv->delivery_system != SYS_DVBT) { | 86 | if (priv->delivery_system != SYS_DVBT) { |
87 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 87 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/cxd2820r_t2.c b/drivers/media/dvb/frontends/cxd2820r_t2.c index 76e3c83127e8..c62cf4df1e7d 100644 --- a/drivers/media/dvb/frontends/cxd2820r_t2.c +++ b/drivers/media/dvb/frontends/cxd2820r_t2.c | |||
@@ -99,7 +99,7 @@ int cxd2820r_set_frontend_t2(struct dvb_frontend *fe, | |||
99 | 99 | ||
100 | /* program tuner */ | 100 | /* program tuner */ |
101 | if (fe->ops.tuner_ops.set_params) | 101 | if (fe->ops.tuner_ops.set_params) |
102 | fe->ops.tuner_ops.set_params(fe, params); | 102 | fe->ops.tuner_ops.set_params(fe); |
103 | 103 | ||
104 | if (priv->delivery_system != SYS_DVBT2) { | 104 | if (priv->delivery_system != SYS_DVBT2) { |
105 | for (i = 0; i < ARRAY_SIZE(tab); i++) { | 105 | for (i = 0; i < ARRAY_SIZE(tab); i++) { |
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c index 4ca3441b2416..3b024bfe980a 100644 --- a/drivers/media/dvb/frontends/dib0070.c +++ b/drivers/media/dvb/frontends/dib0070.c | |||
@@ -516,7 +516,7 @@ static int dib0070_tune_digital(struct dvb_frontend *fe) | |||
516 | } | 516 | } |
517 | 517 | ||
518 | 518 | ||
519 | static int dib0070_tune(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 519 | static int dib0070_tune(struct dvb_frontend *fe) |
520 | { | 520 | { |
521 | struct dib0070_state *state = fe->tuner_priv; | 521 | struct dib0070_state *state = fe->tuner_priv; |
522 | uint32_t ret; | 522 | uint32_t ret; |
diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c index 2b30ab2ade5e..224d81e85091 100644 --- a/drivers/media/dvb/frontends/dib0090.c +++ b/drivers/media/dvb/frontends/dib0090.c | |||
@@ -2566,7 +2566,7 @@ static int dib0090_get_frequency(struct dvb_frontend *fe, u32 * frequency) | |||
2566 | return 0; | 2566 | return 0; |
2567 | } | 2567 | } |
2568 | 2568 | ||
2569 | static int dib0090_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 2569 | static int dib0090_set_params(struct dvb_frontend *fe) |
2570 | { | 2570 | { |
2571 | struct dib0090_state *state = fe->tuner_priv; | 2571 | struct dib0090_state *state = fe->tuner_priv; |
2572 | u32 ret; | 2572 | u32 ret; |
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c index 437904cbf3e6..7403198eeb14 100644 --- a/drivers/media/dvb/frontends/dib3000mb.c +++ b/drivers/media/dvb/frontends/dib3000mb.c | |||
@@ -124,7 +124,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe, | |||
124 | int search_state, seq; | 124 | int search_state, seq; |
125 | 125 | ||
126 | if (tuner && fe->ops.tuner_ops.set_params) { | 126 | if (tuner && fe->ops.tuner_ops.set_params) { |
127 | fe->ops.tuner_ops.set_params(fe, fep); | 127 | fe->ops.tuner_ops.set_params(fe); |
128 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 128 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
129 | 129 | ||
130 | deb_setf("bandwidth: "); | 130 | deb_setf("bandwidth: "); |
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index 088e7fadbe3d..32cd00686419 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/drivers/media/dvb/frontends/dib3000mc.c | |||
@@ -696,7 +696,7 @@ static int dib3000mc_set_frontend(struct dvb_frontend* fe, | |||
696 | state->sfn_workaround_active = buggy_sfn_workaround; | 696 | state->sfn_workaround_active = buggy_sfn_workaround; |
697 | 697 | ||
698 | if (fe->ops.tuner_ops.set_params) { | 698 | if (fe->ops.tuner_ops.set_params) { |
699 | fe->ops.tuner_ops.set_params(fe, fep); | 699 | fe->ops.tuner_ops.set_params(fe); |
700 | msleep(100); | 700 | msleep(100); |
701 | } | 701 | } |
702 | 702 | ||
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index dbb76d75c932..a30a48255bef 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
@@ -1217,7 +1217,7 @@ static int dib7000m_set_frontend(struct dvb_frontend* fe, | |||
1217 | dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); | 1217 | dib7000m_set_bandwidth(state, BANDWIDTH_TO_KHZ(fep->u.ofdm.bandwidth)); |
1218 | 1218 | ||
1219 | if (fe->ops.tuner_ops.set_params) | 1219 | if (fe->ops.tuner_ops.set_params) |
1220 | fe->ops.tuner_ops.set_params(fe, fep); | 1220 | fe->ops.tuner_ops.set_params(fe); |
1221 | 1221 | ||
1222 | /* start up the AGC */ | 1222 | /* start up the AGC */ |
1223 | state->agc_state = 0; | 1223 | state->agc_state = 0; |
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index b5f3fb4f09ed..99832078b6a0 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
@@ -1489,7 +1489,7 @@ static int dib7000p_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_pa | |||
1489 | state->sfn_workaround_active = buggy_sfn_workaround; | 1489 | state->sfn_workaround_active = buggy_sfn_workaround; |
1490 | 1490 | ||
1491 | if (fe->ops.tuner_ops.set_params) | 1491 | if (fe->ops.tuner_ops.set_params) |
1492 | fe->ops.tuner_ops.set_params(fe, fep); | 1492 | fe->ops.tuner_ops.set_params(fe); |
1493 | 1493 | ||
1494 | /* start up the AGC */ | 1494 | /* start up the AGC */ |
1495 | state->agc_state = 0; | 1495 | state->agc_state = 0; |
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c index b8da0c9e085e..2da2bb39cb00 100644 --- a/drivers/media/dvb/frontends/dib8000.c +++ b/drivers/media/dvb/frontends/dib8000.c | |||
@@ -2986,7 +2986,7 @@ static int dib8000_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
2986 | dib8096p_set_output_mode(state->fe[index_frontend], | 2986 | dib8096p_set_output_mode(state->fe[index_frontend], |
2987 | OUTMODE_HIGH_Z); | 2987 | OUTMODE_HIGH_Z); |
2988 | if (state->fe[index_frontend]->ops.tuner_ops.set_params) | 2988 | if (state->fe[index_frontend]->ops.tuner_ops.set_params) |
2989 | state->fe[index_frontend]->ops.tuner_ops.set_params(state->fe[index_frontend], fep); | 2989 | state->fe[index_frontend]->ops.tuner_ops.set_params(state->fe[index_frontend]); |
2990 | 2990 | ||
2991 | dib8000_set_tune_state(state->fe[index_frontend], CT_AGC_START); | 2991 | dib8000_set_tune_state(state->fe[index_frontend], CT_AGC_START); |
2992 | } | 2992 | } |
diff --git a/drivers/media/dvb/frontends/drxd_hard.c b/drivers/media/dvb/frontends/drxd_hard.c index beb67759f824..955d3a58c659 100644 --- a/drivers/media/dvb/frontends/drxd_hard.c +++ b/drivers/media/dvb/frontends/drxd_hard.c | |||
@@ -2907,7 +2907,7 @@ static int drxd_set_frontend(struct dvb_frontend *fe, | |||
2907 | DRX_Stop(state); | 2907 | DRX_Stop(state); |
2908 | 2908 | ||
2909 | if (fe->ops.tuner_ops.set_params) { | 2909 | if (fe->ops.tuner_ops.set_params) { |
2910 | fe->ops.tuner_ops.set_params(fe, param); | 2910 | fe->ops.tuner_ops.set_params(fe); |
2911 | if (fe->ops.i2c_gate_ctrl) | 2911 | if (fe->ops.i2c_gate_ctrl) |
2912 | fe->ops.i2c_gate_ctrl(fe, 0); | 2912 | fe->ops.i2c_gate_ctrl(fe, 0); |
2913 | } | 2913 | } |
diff --git a/drivers/media/dvb/frontends/drxk_hard.c b/drivers/media/dvb/frontends/drxk_hard.c index d795898c0668..83b8474667ac 100644 --- a/drivers/media/dvb/frontends/drxk_hard.c +++ b/drivers/media/dvb/frontends/drxk_hard.c | |||
@@ -6240,7 +6240,7 @@ static int drxk_set_parameters(struct dvb_frontend *fe, | |||
6240 | if (fe->ops.i2c_gate_ctrl) | 6240 | if (fe->ops.i2c_gate_ctrl) |
6241 | fe->ops.i2c_gate_ctrl(fe, 1); | 6241 | fe->ops.i2c_gate_ctrl(fe, 1); |
6242 | if (fe->ops.tuner_ops.set_params) | 6242 | if (fe->ops.tuner_ops.set_params) |
6243 | fe->ops.tuner_ops.set_params(fe, p); | 6243 | fe->ops.tuner_ops.set_params(fe); |
6244 | if (fe->ops.i2c_gate_ctrl) | 6244 | if (fe->ops.i2c_gate_ctrl) |
6245 | fe->ops.i2c_gate_ctrl(fe, 0); | 6245 | fe->ops.i2c_gate_ctrl(fe, 0); |
6246 | state->param = *p; | 6246 | state->param = *p; |
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c index f967cf9b4a60..978805ed3847 100644 --- a/drivers/media/dvb/frontends/dvb-pll.c +++ b/drivers/media/dvb/frontends/dvb-pll.c | |||
@@ -608,8 +608,7 @@ static int dvb_pll_sleep(struct dvb_frontend *fe) | |||
608 | return -EINVAL; | 608 | return -EINVAL; |
609 | } | 609 | } |
610 | 610 | ||
611 | static int dvb_pll_set_params(struct dvb_frontend *fe, | 611 | static int dvb_pll_set_params(struct dvb_frontend *fe) |
612 | struct dvb_frontend_parameters *params) | ||
613 | { | 612 | { |
614 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 613 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
615 | struct dvb_pll_priv *priv = fe->tuner_priv; | 614 | struct dvb_pll_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/dvb_dummy_fe.c b/drivers/media/dvb/frontends/dvb_dummy_fe.c index a7fc7e53a551..e3a7e424f82f 100644 --- a/drivers/media/dvb/frontends/dvb_dummy_fe.c +++ b/drivers/media/dvb/frontends/dvb_dummy_fe.c | |||
@@ -76,7 +76,7 @@ static int dvb_dummy_fe_get_frontend(struct dvb_frontend* fe, struct dvb_fronten | |||
76 | static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) | 76 | static int dvb_dummy_fe_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters *p) |
77 | { | 77 | { |
78 | if (fe->ops.tuner_ops.set_params) { | 78 | if (fe->ops.tuner_ops.set_params) { |
79 | fe->ops.tuner_ops.set_params(fe, p); | 79 | fe->ops.tuner_ops.set_params(fe); |
80 | if (fe->ops.i2c_gate_ctrl) | 80 | if (fe->ops.i2c_gate_ctrl) |
81 | fe->ops.i2c_gate_ctrl(fe, 0); | 81 | fe->ops.i2c_gate_ctrl(fe, 0); |
82 | } | 82 | } |
diff --git a/drivers/media/dvb/frontends/ec100.c b/drivers/media/dvb/frontends/ec100.c index 2414dc6ee5d9..1ef79f0208e2 100644 --- a/drivers/media/dvb/frontends/ec100.c +++ b/drivers/media/dvb/frontends/ec100.c | |||
@@ -88,7 +88,7 @@ static int ec100_set_frontend(struct dvb_frontend *fe, | |||
88 | 88 | ||
89 | /* program tuner */ | 89 | /* program tuner */ |
90 | if (fe->ops.tuner_ops.set_params) | 90 | if (fe->ops.tuner_ops.set_params) |
91 | fe->ops.tuner_ops.set_params(fe, params); | 91 | fe->ops.tuner_ops.set_params(fe); |
92 | 92 | ||
93 | ret = ec100_write_reg(state, 0x04, 0x06); | 93 | ret = ec100_write_reg(state, 0x04, 0x06); |
94 | if (ret) | 94 | if (ret) |
diff --git a/drivers/media/dvb/frontends/it913x-fe.c b/drivers/media/dvb/frontends/it913x-fe.c index 8088e62a2028..8857710b90e4 100644 --- a/drivers/media/dvb/frontends/it913x-fe.c +++ b/drivers/media/dvb/frontends/it913x-fe.c | |||
@@ -642,7 +642,7 @@ static int it913x_fe_set_frontend(struct dvb_frontend *fe, | |||
642 | break; | 642 | break; |
643 | default: | 643 | default: |
644 | if (fe->ops.tuner_ops.set_params) { | 644 | if (fe->ops.tuner_ops.set_params) { |
645 | fe->ops.tuner_ops.set_params(fe, p); | 645 | fe->ops.tuner_ops.set_params(fe); |
646 | if (fe->ops.i2c_gate_ctrl) | 646 | if (fe->ops.i2c_gate_ctrl) |
647 | fe->ops.i2c_gate_ctrl(fe, 0); | 647 | fe->ops.i2c_gate_ctrl(fe, 0); |
648 | } | 648 | } |
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c index afe7cc0d859e..316457584fe7 100644 --- a/drivers/media/dvb/frontends/itd1000.c +++ b/drivers/media/dvb/frontends/itd1000.c | |||
@@ -250,7 +250,7 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz) | |||
250 | itd1000_set_vco(state, freq_khz); | 250 | itd1000_set_vco(state, freq_khz); |
251 | } | 251 | } |
252 | 252 | ||
253 | static int itd1000_set_parameters(struct dvb_frontend *fe, struct dvb_frontend_parameters *p) | 253 | static int itd1000_set_parameters(struct dvb_frontend *fe) |
254 | { | 254 | { |
255 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 255 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
256 | struct itd1000_state *state = fe->tuner_priv; | 256 | struct itd1000_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/ix2505v.c b/drivers/media/dvb/frontends/ix2505v.c index aca48172504c..bc5a82082aaa 100644 --- a/drivers/media/dvb/frontends/ix2505v.c +++ b/drivers/media/dvb/frontends/ix2505v.c | |||
@@ -129,8 +129,7 @@ static int ix2505v_release(struct dvb_frontend *fe) | |||
129 | * 1 -> 8 -> 6 | 129 | * 1 -> 8 -> 6 |
130 | */ | 130 | */ |
131 | 131 | ||
132 | static int ix2505v_set_params(struct dvb_frontend *fe, | 132 | static int ix2505v_set_params(struct dvb_frontend *fe) |
133 | struct dvb_frontend_parameters *params) | ||
134 | { | 133 | { |
135 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 134 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
136 | struct ix2505v_state *state = fe->tuner_priv; | 135 | struct ix2505v_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c index 445fa1068064..eee6bb54503f 100644 --- a/drivers/media/dvb/frontends/l64781.c +++ b/drivers/media/dvb/frontends/l64781.c | |||
@@ -140,7 +140,7 @@ static int apply_frontend_param (struct dvb_frontend* fe, struct dvb_frontend_pa | |||
140 | int bw = p->bandwidth - BANDWIDTH_8_MHZ; | 140 | int bw = p->bandwidth - BANDWIDTH_8_MHZ; |
141 | 141 | ||
142 | if (fe->ops.tuner_ops.set_params) { | 142 | if (fe->ops.tuner_ops.set_params) { |
143 | fe->ops.tuner_ops.set_params(fe, param); | 143 | fe->ops.tuner_ops.set_params(fe); |
144 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 144 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
145 | } | 145 | } |
146 | 146 | ||
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c index 3272881cb112..321f9911ba92 100644 --- a/drivers/media/dvb/frontends/lgdt3305.c +++ b/drivers/media/dvb/frontends/lgdt3305.c | |||
@@ -686,7 +686,7 @@ static int lgdt3304_set_parameters(struct dvb_frontend *fe, | |||
686 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); | 686 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); |
687 | 687 | ||
688 | if (fe->ops.tuner_ops.set_params) { | 688 | if (fe->ops.tuner_ops.set_params) { |
689 | ret = fe->ops.tuner_ops.set_params(fe, param); | 689 | ret = fe->ops.tuner_ops.set_params(fe); |
690 | if (fe->ops.i2c_gate_ctrl) | 690 | if (fe->ops.i2c_gate_ctrl) |
691 | fe->ops.i2c_gate_ctrl(fe, 0); | 691 | fe->ops.i2c_gate_ctrl(fe, 0); |
692 | if (lg_fail(ret)) | 692 | if (lg_fail(ret)) |
@@ -756,7 +756,7 @@ static int lgdt3305_set_parameters(struct dvb_frontend *fe, | |||
756 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); | 756 | lg_dbg("(%d, %d)\n", param->frequency, param->u.vsb.modulation); |
757 | 757 | ||
758 | if (fe->ops.tuner_ops.set_params) { | 758 | if (fe->ops.tuner_ops.set_params) { |
759 | ret = fe->ops.tuner_ops.set_params(fe, param); | 759 | ret = fe->ops.tuner_ops.set_params(fe); |
760 | if (fe->ops.i2c_gate_ctrl) | 760 | if (fe->ops.i2c_gate_ctrl) |
761 | fe->ops.i2c_gate_ctrl(fe, 0); | 761 | fe->ops.i2c_gate_ctrl(fe, 0); |
762 | if (lg_fail(ret)) | 762 | if (lg_fail(ret)) |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index c39d8d63979b..ab3971264e36 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
@@ -424,7 +424,7 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, | |||
424 | 424 | ||
425 | /* Tune to the specified frequency */ | 425 | /* Tune to the specified frequency */ |
426 | if (fe->ops.tuner_ops.set_params) { | 426 | if (fe->ops.tuner_ops.set_params) { |
427 | fe->ops.tuner_ops.set_params(fe, param); | 427 | fe->ops.tuner_ops.set_params(fe); |
428 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 428 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
429 | } | 429 | } |
430 | 430 | ||
diff --git a/drivers/media/dvb/frontends/lgs8gl5.c b/drivers/media/dvb/frontends/lgs8gl5.c index bb37ed289a05..4a9bd999942f 100644 --- a/drivers/media/dvb/frontends/lgs8gl5.c +++ b/drivers/media/dvb/frontends/lgs8gl5.c | |||
@@ -322,7 +322,7 @@ lgs8gl5_set_frontend(struct dvb_frontend *fe, | |||
322 | return -EINVAL; | 322 | return -EINVAL; |
323 | 323 | ||
324 | if (fe->ops.tuner_ops.set_params) { | 324 | if (fe->ops.tuner_ops.set_params) { |
325 | fe->ops.tuner_ops.set_params(fe, p); | 325 | fe->ops.tuner_ops.set_params(fe); |
326 | if (fe->ops.i2c_gate_ctrl) | 326 | if (fe->ops.i2c_gate_ctrl) |
327 | fe->ops.i2c_gate_ctrl(fe, 0); | 327 | fe->ops.i2c_gate_ctrl(fe, 0); |
328 | } | 328 | } |
diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c index 1172b54689f8..bf9b12b00a93 100644 --- a/drivers/media/dvb/frontends/lgs8gxx.c +++ b/drivers/media/dvb/frontends/lgs8gxx.c | |||
@@ -678,7 +678,7 @@ static int lgs8gxx_set_fe(struct dvb_frontend *fe, | |||
678 | 678 | ||
679 | /* set frequency */ | 679 | /* set frequency */ |
680 | if (fe->ops.tuner_ops.set_params) { | 680 | if (fe->ops.tuner_ops.set_params) { |
681 | fe->ops.tuner_ops.set_params(fe, fe_params); | 681 | fe->ops.tuner_ops.set_params(fe); |
682 | if (fe->ops.i2c_gate_ctrl) | 682 | if (fe->ops.i2c_gate_ctrl) |
683 | fe->ops.i2c_gate_ctrl(fe, 0); | 683 | fe->ops.i2c_gate_ctrl(fe, 0); |
684 | } | 684 | } |
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c index 0f867a5055fb..8c92070988e4 100644 --- a/drivers/media/dvb/frontends/mb86a20s.c +++ b/drivers/media/dvb/frontends/mb86a20s.c | |||
@@ -496,7 +496,7 @@ static int mb86a20s_set_frontend(struct dvb_frontend *fe, | |||
496 | if (fe->ops.i2c_gate_ctrl) | 496 | if (fe->ops.i2c_gate_ctrl) |
497 | fe->ops.i2c_gate_ctrl(fe, 1); | 497 | fe->ops.i2c_gate_ctrl(fe, 1); |
498 | dprintk("Calling tuner set parameters\n"); | 498 | dprintk("Calling tuner set parameters\n"); |
499 | fe->ops.tuner_ops.set_params(fe, p); | 499 | fe->ops.tuner_ops.set_params(fe); |
500 | 500 | ||
501 | /* | 501 | /* |
502 | * Make it more reliable: if, for some reason, the initial | 502 | * Make it more reliable: if, for some reason, the initial |
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index 83e6f1a1b700..302d72a81b48 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -603,7 +603,7 @@ static int mt312_set_frontend(struct dvb_frontend *fe, | |||
603 | } | 603 | } |
604 | 604 | ||
605 | if (fe->ops.tuner_ops.set_params) { | 605 | if (fe->ops.tuner_ops.set_params) { |
606 | fe->ops.tuner_ops.set_params(fe, p); | 606 | fe->ops.tuner_ops.set_params(fe); |
607 | if (fe->ops.i2c_gate_ctrl) | 607 | if (fe->ops.i2c_gate_ctrl) |
608 | fe->ops.i2c_gate_ctrl(fe, 0); | 608 | fe->ops.i2c_gate_ctrl(fe, 0); |
609 | } | 609 | } |
diff --git a/drivers/media/dvb/frontends/mt352.c b/drivers/media/dvb/frontends/mt352.c index e2a86daba502..16a9fac2ba6c 100644 --- a/drivers/media/dvb/frontends/mt352.c +++ b/drivers/media/dvb/frontends/mt352.c | |||
@@ -293,7 +293,7 @@ static int mt352_set_parameters(struct dvb_frontend* fe, | |||
293 | 293 | ||
294 | if (state->config.no_tuner) { | 294 | if (state->config.no_tuner) { |
295 | if (fe->ops.tuner_ops.set_params) { | 295 | if (fe->ops.tuner_ops.set_params) { |
296 | fe->ops.tuner_ops.set_params(fe, param); | 296 | fe->ops.tuner_ops.set_params(fe); |
297 | if (fe->ops.i2c_gate_ctrl) | 297 | if (fe->ops.i2c_gate_ctrl) |
298 | fe->ops.i2c_gate_ctrl(fe, 0); | 298 | fe->ops.i2c_gate_ctrl(fe, 0); |
299 | } | 299 | } |
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c index 6599b8fea9e9..d17dd2ddc2f2 100644 --- a/drivers/media/dvb/frontends/nxt6000.c +++ b/drivers/media/dvb/frontends/nxt6000.c | |||
@@ -463,7 +463,7 @@ static int nxt6000_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
463 | int result; | 463 | int result; |
464 | 464 | ||
465 | if (fe->ops.tuner_ops.set_params) { | 465 | if (fe->ops.tuner_ops.set_params) { |
466 | fe->ops.tuner_ops.set_params(fe, param); | 466 | fe->ops.tuner_ops.set_params(fe); |
467 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 467 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
468 | } | 468 | } |
469 | 469 | ||
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c index 38e67accb8c3..5cd965b05ee8 100644 --- a/drivers/media/dvb/frontends/or51132.c +++ b/drivers/media/dvb/frontends/or51132.c | |||
@@ -363,7 +363,7 @@ static int or51132_set_parameters(struct dvb_frontend* fe, | |||
363 | } | 363 | } |
364 | 364 | ||
365 | if (fe->ops.tuner_ops.set_params) { | 365 | if (fe->ops.tuner_ops.set_params) { |
366 | fe->ops.tuner_ops.set_params(fe, param); | 366 | fe->ops.tuner_ops.set_params(fe); |
367 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 367 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
368 | } | 368 | } |
369 | 369 | ||
diff --git a/drivers/media/dvb/frontends/or51211.c b/drivers/media/dvb/frontends/or51211.c index c709ce6771c8..92d4dd8bba40 100644 --- a/drivers/media/dvb/frontends/or51211.c +++ b/drivers/media/dvb/frontends/or51211.c | |||
@@ -226,7 +226,7 @@ static int or51211_set_parameters(struct dvb_frontend* fe, | |||
226 | /* Change only if we are actually changing the channel */ | 226 | /* Change only if we are actually changing the channel */ |
227 | if (state->current_frequency != param->frequency) { | 227 | if (state->current_frequency != param->frequency) { |
228 | if (fe->ops.tuner_ops.set_params) { | 228 | if (fe->ops.tuner_ops.set_params) { |
229 | fe->ops.tuner_ops.set_params(fe, param); | 229 | fe->ops.tuner_ops.set_params(fe); |
230 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 230 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
231 | } | 231 | } |
232 | 232 | ||
diff --git a/drivers/media/dvb/frontends/s5h1409.c b/drivers/media/dvb/frontends/s5h1409.c index 0d6d5e3e2c31..5ffb19e86c16 100644 --- a/drivers/media/dvb/frontends/s5h1409.c +++ b/drivers/media/dvb/frontends/s5h1409.c | |||
@@ -647,7 +647,7 @@ static int s5h1409_set_frontend(struct dvb_frontend *fe, | |||
647 | if (fe->ops.tuner_ops.set_params) { | 647 | if (fe->ops.tuner_ops.set_params) { |
648 | if (fe->ops.i2c_gate_ctrl) | 648 | if (fe->ops.i2c_gate_ctrl) |
649 | fe->ops.i2c_gate_ctrl(fe, 1); | 649 | fe->ops.i2c_gate_ctrl(fe, 1); |
650 | fe->ops.tuner_ops.set_params(fe, p); | 650 | fe->ops.tuner_ops.set_params(fe); |
651 | if (fe->ops.i2c_gate_ctrl) | 651 | if (fe->ops.i2c_gate_ctrl) |
652 | fe->ops.i2c_gate_ctrl(fe, 0); | 652 | fe->ops.i2c_gate_ctrl(fe, 0); |
653 | } | 653 | } |
diff --git a/drivers/media/dvb/frontends/s5h1411.c b/drivers/media/dvb/frontends/s5h1411.c index 5fca113a2013..6852abe24ab8 100644 --- a/drivers/media/dvb/frontends/s5h1411.c +++ b/drivers/media/dvb/frontends/s5h1411.c | |||
@@ -602,7 +602,7 @@ static int s5h1411_set_frontend(struct dvb_frontend *fe, | |||
602 | if (fe->ops.i2c_gate_ctrl) | 602 | if (fe->ops.i2c_gate_ctrl) |
603 | fe->ops.i2c_gate_ctrl(fe, 1); | 603 | fe->ops.i2c_gate_ctrl(fe, 1); |
604 | 604 | ||
605 | fe->ops.tuner_ops.set_params(fe, p); | 605 | fe->ops.tuner_ops.set_params(fe); |
606 | 606 | ||
607 | if (fe->ops.i2c_gate_ctrl) | 607 | if (fe->ops.i2c_gate_ctrl) |
608 | fe->ops.i2c_gate_ctrl(fe, 0); | 608 | fe->ops.i2c_gate_ctrl(fe, 0); |
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c index 3879d2e378aa..c4a8a01a6ca6 100644 --- a/drivers/media/dvb/frontends/s5h1420.c +++ b/drivers/media/dvb/frontends/s5h1420.c | |||
@@ -649,7 +649,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, | |||
649 | (state->symbol_rate == p->u.qpsk.symbol_rate)) { | 649 | (state->symbol_rate == p->u.qpsk.symbol_rate)) { |
650 | 650 | ||
651 | if (fe->ops.tuner_ops.set_params) { | 651 | if (fe->ops.tuner_ops.set_params) { |
652 | fe->ops.tuner_ops.set_params(fe, p); | 652 | fe->ops.tuner_ops.set_params(fe); |
653 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 653 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
654 | } | 654 | } |
655 | if (fe->ops.tuner_ops.get_frequency) { | 655 | if (fe->ops.tuner_ops.get_frequency) { |
@@ -744,7 +744,7 @@ static int s5h1420_set_frontend(struct dvb_frontend* fe, | |||
744 | 744 | ||
745 | /* set tuner PLL */ | 745 | /* set tuner PLL */ |
746 | if (fe->ops.tuner_ops.set_params) { | 746 | if (fe->ops.tuner_ops.set_params) { |
747 | fe->ops.tuner_ops.set_params(fe, p); | 747 | fe->ops.tuner_ops.set_params(fe); |
748 | if (fe->ops.i2c_gate_ctrl) | 748 | if (fe->ops.i2c_gate_ctrl) |
749 | fe->ops.i2c_gate_ctrl(fe, 0); | 749 | fe->ops.i2c_gate_ctrl(fe, 0); |
750 | s5h1420_setfreqoffset(state, 0); | 750 | s5h1420_setfreqoffset(state, 0); |
diff --git a/drivers/media/dvb/frontends/s5h1432.c b/drivers/media/dvb/frontends/s5h1432.c index 0c6dcb90d168..2717bae1e514 100644 --- a/drivers/media/dvb/frontends/s5h1432.c +++ b/drivers/media/dvb/frontends/s5h1432.c | |||
@@ -188,7 +188,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
188 | /*current_frequency = p->frequency; */ | 188 | /*current_frequency = p->frequency; */ |
189 | /*state->current_frequency = p->frequency; */ | 189 | /*state->current_frequency = p->frequency; */ |
190 | } else { | 190 | } else { |
191 | fe->ops.tuner_ops.set_params(fe, p); | 191 | fe->ops.tuner_ops.set_params(fe); |
192 | msleep(300); | 192 | msleep(300); |
193 | s5h1432_set_channel_bandwidth(fe, dvb_bandwidth); | 193 | s5h1432_set_channel_bandwidth(fe, dvb_bandwidth); |
194 | switch (p->u.ofdm.bandwidth) { | 194 | switch (p->u.ofdm.bandwidth) { |
@@ -207,7 +207,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
207 | default: | 207 | default: |
208 | return 0; | 208 | return 0; |
209 | } | 209 | } |
210 | /*fe->ops.tuner_ops.set_params(fe, p); */ | 210 | /*fe->ops.tuner_ops.set_params(fe); */ |
211 | /*Soft Reset chip*/ | 211 | /*Soft Reset chip*/ |
212 | msleep(30); | 212 | msleep(30); |
213 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); | 213 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); |
@@ -231,7 +231,7 @@ static int s5h1432_set_frontend(struct dvb_frontend *fe, | |||
231 | default: | 231 | default: |
232 | return 0; | 232 | return 0; |
233 | } | 233 | } |
234 | /*fe->ops.tuner_ops.set_params(fe,p); */ | 234 | /*fe->ops.tuner_ops.set_params(fe); */ |
235 | /*Soft Reset chip*/ | 235 | /*Soft Reset chip*/ |
236 | msleep(30); | 236 | msleep(30); |
237 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); | 237 | s5h1432_writereg(state, S5H1432_I2C_TOP_ADDR, 0x09, 0x1a); |
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c index b85eb60a893e..9cff9098a41b 100644 --- a/drivers/media/dvb/frontends/sp8870.c +++ b/drivers/media/dvb/frontends/sp8870.c | |||
@@ -260,7 +260,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, | |||
260 | 260 | ||
261 | // set tuner parameters | 261 | // set tuner parameters |
262 | if (fe->ops.tuner_ops.set_params) { | 262 | if (fe->ops.tuner_ops.set_params) { |
263 | fe->ops.tuner_ops.set_params(fe, p); | 263 | fe->ops.tuner_ops.set_params(fe); |
264 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 264 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
265 | } | 265 | } |
266 | 266 | ||
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c index 4a7c3d842608..efe09268296b 100644 --- a/drivers/media/dvb/frontends/sp887x.c +++ b/drivers/media/dvb/frontends/sp887x.c | |||
@@ -353,7 +353,7 @@ static int sp887x_setup_frontend_parameters (struct dvb_frontend* fe, | |||
353 | 353 | ||
354 | /* setup the PLL */ | 354 | /* setup the PLL */ |
355 | if (fe->ops.tuner_ops.set_params) { | 355 | if (fe->ops.tuner_ops.set_params) { |
356 | fe->ops.tuner_ops.set_params(fe, p); | 356 | fe->ops.tuner_ops.set_params(fe); |
357 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 357 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
358 | } | 358 | } |
359 | if (fe->ops.tuner_ops.get_frequency) { | 359 | if (fe->ops.tuner_ops.get_frequency) { |
diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c index d4f4ebbfce3a..a0c3c526b132 100644 --- a/drivers/media/dvb/frontends/stb6000.c +++ b/drivers/media/dvb/frontends/stb6000.c | |||
@@ -75,8 +75,7 @@ static int stb6000_sleep(struct dvb_frontend *fe) | |||
75 | return (ret == 1) ? 0 : ret; | 75 | return (ret == 1) ? 0 : ret; |
76 | } | 76 | } |
77 | 77 | ||
78 | static int stb6000_set_params(struct dvb_frontend *fe, | 78 | static int stb6000_set_params(struct dvb_frontend *fe) |
79 | struct dvb_frontend_parameters *params) | ||
80 | { | 79 | { |
81 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 80 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
82 | struct stb6000_priv *priv = fe->tuner_priv; | 81 | struct stb6000_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/stv0288.c b/drivers/media/dvb/frontends/stv0288.c index 0aa3962ff18b..a1b493391f45 100644 --- a/drivers/media/dvb/frontends/stv0288.c +++ b/drivers/media/dvb/frontends/stv0288.c | |||
@@ -484,7 +484,7 @@ static int stv0288_set_frontend(struct dvb_frontend *fe, | |||
484 | dfp->frequency = c->frequency; | 484 | dfp->frequency = c->frequency; |
485 | dfp->u.qpsk.symbol_rate = c->symbol_rate; | 485 | dfp->u.qpsk.symbol_rate = c->symbol_rate; |
486 | if (fe->ops.tuner_ops.set_params) { | 486 | if (fe->ops.tuner_ops.set_params) { |
487 | fe->ops.tuner_ops.set_params(fe, dfp); | 487 | fe->ops.tuner_ops.set_params(fe); |
488 | if (fe->ops.i2c_gate_ctrl) | 488 | if (fe->ops.i2c_gate_ctrl) |
489 | fe->ops.i2c_gate_ctrl(fe, 0); | 489 | fe->ops.i2c_gate_ctrl(fe, 0); |
490 | } | 490 | } |
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c index 84d88f33275e..daeaddf6f883 100644 --- a/drivers/media/dvb/frontends/stv0297.c +++ b/drivers/media/dvb/frontends/stv0297.c | |||
@@ -455,7 +455,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par | |||
455 | 455 | ||
456 | stv0297_init(fe); | 456 | stv0297_init(fe); |
457 | if (fe->ops.tuner_ops.set_params) { | 457 | if (fe->ops.tuner_ops.set_params) { |
458 | fe->ops.tuner_ops.set_params(fe, p); | 458 | fe->ops.tuner_ops.set_params(fe); |
459 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 459 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
460 | } | 460 | } |
461 | 461 | ||
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 42684bec8883..bd79e05cdc7e 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
@@ -579,7 +579,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
579 | stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval); | 579 | stv0299_writeregI(state, 0x0c, (stv0299_readreg(state, 0x0c) & 0xfe) | invval); |
580 | 580 | ||
581 | if (fe->ops.tuner_ops.set_params) { | 581 | if (fe->ops.tuner_ops.set_params) { |
582 | fe->ops.tuner_ops.set_params(fe, p); | 582 | fe->ops.tuner_ops.set_params(fe); |
583 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 583 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
584 | } | 584 | } |
585 | 585 | ||
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c index e57ab53e2e27..586295df7cab 100644 --- a/drivers/media/dvb/frontends/stv0367.c +++ b/drivers/media/dvb/frontends/stv0367.c | |||
@@ -1822,7 +1822,7 @@ static int stv0367ter_set_frontend(struct dvb_frontend *fe, | |||
1822 | if (fe->ops.tuner_ops.set_params) { | 1822 | if (fe->ops.tuner_ops.set_params) { |
1823 | if (fe->ops.i2c_gate_ctrl) | 1823 | if (fe->ops.i2c_gate_ctrl) |
1824 | fe->ops.i2c_gate_ctrl(fe, 1); | 1824 | fe->ops.i2c_gate_ctrl(fe, 1); |
1825 | fe->ops.tuner_ops.set_params(fe, param); | 1825 | fe->ops.tuner_ops.set_params(fe); |
1826 | if (fe->ops.i2c_gate_ctrl) | 1826 | if (fe->ops.i2c_gate_ctrl) |
1827 | fe->ops.i2c_gate_ctrl(fe, 0); | 1827 | fe->ops.i2c_gate_ctrl(fe, 0); |
1828 | } | 1828 | } |
@@ -3120,7 +3120,7 @@ static int stv0367cab_set_frontend(struct dvb_frontend *fe, | |||
3120 | if (fe->ops.tuner_ops.set_params) { | 3120 | if (fe->ops.tuner_ops.set_params) { |
3121 | if (fe->ops.i2c_gate_ctrl) | 3121 | if (fe->ops.i2c_gate_ctrl) |
3122 | fe->ops.i2c_gate_ctrl(fe, 1); | 3122 | fe->ops.i2c_gate_ctrl(fe, 1); |
3123 | fe->ops.tuner_ops.set_params(fe, param); | 3123 | fe->ops.tuner_ops.set_params(fe); |
3124 | if (fe->ops.i2c_gate_ctrl) | 3124 | if (fe->ops.i2c_gate_ctrl) |
3125 | fe->ops.i2c_gate_ctrl(fe, 0); | 3125 | fe->ops.i2c_gate_ctrl(fe, 0); |
3126 | } | 3126 | } |
diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb/frontends/stv6110.c index 2dca7c8e5148..20b5fa92c53e 100644 --- a/drivers/media/dvb/frontends/stv6110.c +++ b/drivers/media/dvb/frontends/stv6110.c | |||
@@ -347,8 +347,7 @@ static int stv6110_set_frequency(struct dvb_frontend *fe, u32 frequency) | |||
347 | return 0; | 347 | return 0; |
348 | } | 348 | } |
349 | 349 | ||
350 | static int stv6110_set_params(struct dvb_frontend *fe, | 350 | static int stv6110_set_params(struct dvb_frontend *fe) |
351 | struct dvb_frontend_parameters *params) | ||
352 | { | 351 | { |
353 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 352 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
354 | u32 bandwidth = carrier_width(c->symbol_rate, c->rolloff); | 353 | u32 bandwidth = carrier_width(c->symbol_rate, c->rolloff); |
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index 2518c5a33225..a1629d1d565b 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -283,7 +283,7 @@ static int tda10021_set_parameters (struct dvb_frontend *fe, | |||
283 | //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate); | 283 | //printk("tda10021: set frequency to %d qam=%d symrate=%d\n", p->frequency,qam,p->u.qam.symbol_rate); |
284 | 284 | ||
285 | if (fe->ops.tuner_ops.set_params) { | 285 | if (fe->ops.tuner_ops.set_params) { |
286 | fe->ops.tuner_ops.set_params(fe, p); | 286 | fe->ops.tuner_ops.set_params(fe); |
287 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 287 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
288 | } | 288 | } |
289 | 289 | ||
diff --git a/drivers/media/dvb/frontends/tda10023.c b/drivers/media/dvb/frontends/tda10023.c index af7f1b808a34..ecc4b5592a17 100644 --- a/drivers/media/dvb/frontends/tda10023.c +++ b/drivers/media/dvb/frontends/tda10023.c | |||
@@ -351,7 +351,7 @@ static int tda10023_set_parameters (struct dvb_frontend *fe, | |||
351 | } | 351 | } |
352 | 352 | ||
353 | if (fe->ops.tuner_ops.set_params) { | 353 | if (fe->ops.tuner_ops.set_params) { |
354 | fe->ops.tuner_ops.set_params(fe, p); | 354 | fe->ops.tuner_ops.set_params(fe); |
355 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 355 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
356 | } | 356 | } |
357 | 357 | ||
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c index 7f105946a434..d450385d91cc 100644 --- a/drivers/media/dvb/frontends/tda10048.c +++ b/drivers/media/dvb/frontends/tda10048.c | |||
@@ -756,7 +756,7 @@ static int tda10048_set_frontend(struct dvb_frontend *fe, | |||
756 | if (fe->ops.i2c_gate_ctrl) | 756 | if (fe->ops.i2c_gate_ctrl) |
757 | fe->ops.i2c_gate_ctrl(fe, 1); | 757 | fe->ops.i2c_gate_ctrl(fe, 1); |
758 | 758 | ||
759 | fe->ops.tuner_ops.set_params(fe, p); | 759 | fe->ops.tuner_ops.set_params(fe); |
760 | 760 | ||
761 | if (fe->ops.i2c_gate_ctrl) | 761 | if (fe->ops.i2c_gate_ctrl) |
762 | fe->ops.i2c_gate_ctrl(fe, 0); | 762 | fe->ops.i2c_gate_ctrl(fe, 0); |
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index ea485d923550..dbac35bbca57 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c | |||
@@ -718,7 +718,7 @@ static int tda1004x_set_fe(struct dvb_frontend* fe, | |||
718 | 718 | ||
719 | // set frequency | 719 | // set frequency |
720 | if (fe->ops.tuner_ops.set_params) { | 720 | if (fe->ops.tuner_ops.set_params) { |
721 | fe->ops.tuner_ops.set_params(fe, fe_params); | 721 | fe->ops.tuner_ops.set_params(fe); |
722 | if (fe->ops.i2c_gate_ctrl) | 722 | if (fe->ops.i2c_gate_ctrl) |
723 | fe->ops.i2c_gate_ctrl(fe, 0); | 723 | fe->ops.i2c_gate_ctrl(fe, 0); |
724 | } | 724 | } |
diff --git a/drivers/media/dvb/frontends/tda10086.c b/drivers/media/dvb/frontends/tda10086.c index f2c8faac6f36..7656ff7b41aa 100644 --- a/drivers/media/dvb/frontends/tda10086.c +++ b/drivers/media/dvb/frontends/tda10086.c | |||
@@ -425,7 +425,7 @@ static int tda10086_set_frontend(struct dvb_frontend* fe, | |||
425 | 425 | ||
426 | /* set params */ | 426 | /* set params */ |
427 | if (fe->ops.tuner_ops.set_params) { | 427 | if (fe->ops.tuner_ops.set_params) { |
428 | fe->ops.tuner_ops.set_params(fe, fe_params); | 428 | fe->ops.tuner_ops.set_params(fe); |
429 | if (fe->ops.i2c_gate_ctrl) | 429 | if (fe->ops.i2c_gate_ctrl) |
430 | fe->ops.i2c_gate_ctrl(fe, 0); | 430 | fe->ops.i2c_gate_ctrl(fe, 0); |
431 | 431 | ||
diff --git a/drivers/media/dvb/frontends/tda18271c2dd.c b/drivers/media/dvb/frontends/tda18271c2dd.c index f8933cf66ebb..86da3d816498 100644 --- a/drivers/media/dvb/frontends/tda18271c2dd.c +++ b/drivers/media/dvb/frontends/tda18271c2dd.c | |||
@@ -1124,8 +1124,7 @@ static int release(struct dvb_frontend *fe) | |||
1124 | } | 1124 | } |
1125 | 1125 | ||
1126 | 1126 | ||
1127 | static int set_params(struct dvb_frontend *fe, | 1127 | static int set_params(struct dvb_frontend *fe) |
1128 | struct dvb_frontend_parameters *params) | ||
1129 | { | 1128 | { |
1130 | struct tda_state *state = fe->tuner_priv; | 1129 | struct tda_state *state = fe->tuner_priv; |
1131 | int status = 0; | 1130 | int status = 0; |
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c index 9369f7442f27..3f2b1b8eb00b 100644 --- a/drivers/media/dvb/frontends/tda8083.c +++ b/drivers/media/dvb/frontends/tda8083.c | |||
@@ -320,7 +320,7 @@ static int tda8083_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
320 | struct tda8083_state* state = fe->demodulator_priv; | 320 | struct tda8083_state* state = fe->demodulator_priv; |
321 | 321 | ||
322 | if (fe->ops.tuner_ops.set_params) { | 322 | if (fe->ops.tuner_ops.set_params) { |
323 | fe->ops.tuner_ops.set_params(fe, p); | 323 | fe->ops.tuner_ops.set_params(fe); |
324 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 324 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
325 | } | 325 | } |
326 | 326 | ||
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c index ab9122a237f5..04bbcc24de0a 100644 --- a/drivers/media/dvb/frontends/tda826x.c +++ b/drivers/media/dvb/frontends/tda826x.c | |||
@@ -71,7 +71,7 @@ static int tda826x_sleep(struct dvb_frontend *fe) | |||
71 | return (ret == 1) ? 0 : ret; | 71 | return (ret == 1) ? 0 : ret; |
72 | } | 72 | } |
73 | 73 | ||
74 | static int tda826x_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 74 | static int tda826x_set_params(struct dvb_frontend *fe) |
75 | { | 75 | { |
76 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 76 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
77 | struct tda826x_priv *priv = fe->tuner_priv; | 77 | struct tda826x_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/tdhd1.h b/drivers/media/dvb/frontends/tdhd1.h index 9db221bf35ad..17750985db0c 100644 --- a/drivers/media/dvb/frontends/tdhd1.h +++ b/drivers/media/dvb/frontends/tdhd1.h | |||
@@ -40,7 +40,7 @@ static struct tda1004x_config alps_tdhd1_204a_config = { | |||
40 | .request_firmware = alps_tdhd1_204_request_firmware | 40 | .request_firmware = alps_tdhd1_204_request_firmware |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 43 | static int alps_tdhd1_204a_tuner_set_params(struct dvb_frontend *fe) |
44 | { | 44 | { |
45 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 45 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
46 | struct i2c_adapter *i2c = fe->tuner_priv; | 46 | struct i2c_adapter *i2c = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb/frontends/tua6100.c index 7842e620e6b3..029384d1fddd 100644 --- a/drivers/media/dvb/frontends/tua6100.c +++ b/drivers/media/dvb/frontends/tua6100.c | |||
@@ -67,8 +67,7 @@ static int tua6100_sleep(struct dvb_frontend *fe) | |||
67 | return (ret == 1) ? 0 : ret; | 67 | return (ret == 1) ? 0 : ret; |
68 | } | 68 | } |
69 | 69 | ||
70 | static int tua6100_set_params(struct dvb_frontend *fe, | 70 | static int tua6100_set_params(struct dvb_frontend *fe) |
71 | struct dvb_frontend_parameters *params) | ||
72 | { | 71 | { |
73 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 72 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
74 | struct tua6100_priv *priv = fe->tuner_priv; | 73 | struct tua6100_priv *priv = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/ves1820.c b/drivers/media/dvb/frontends/ves1820.c index 550a07a8a997..270c7f93008b 100644 --- a/drivers/media/dvb/frontends/ves1820.c +++ b/drivers/media/dvb/frontends/ves1820.c | |||
@@ -219,7 +219,7 @@ static int ves1820_set_parameters(struct dvb_frontend* fe, struct dvb_frontend_p | |||
219 | return -EINVAL; | 219 | return -EINVAL; |
220 | 220 | ||
221 | if (fe->ops.tuner_ops.set_params) { | 221 | if (fe->ops.tuner_ops.set_params) { |
222 | fe->ops.tuner_ops.set_params(fe, p); | 222 | fe->ops.tuner_ops.set_params(fe); |
223 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 223 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
224 | } | 224 | } |
225 | 225 | ||
diff --git a/drivers/media/dvb/frontends/ves1x93.c b/drivers/media/dvb/frontends/ves1x93.c index 8d7854c2fb0c..5ffbf5e89a65 100644 --- a/drivers/media/dvb/frontends/ves1x93.c +++ b/drivers/media/dvb/frontends/ves1x93.c | |||
@@ -389,7 +389,7 @@ static int ves1x93_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
389 | struct ves1x93_state* state = fe->demodulator_priv; | 389 | struct ves1x93_state* state = fe->demodulator_priv; |
390 | 390 | ||
391 | if (fe->ops.tuner_ops.set_params) { | 391 | if (fe->ops.tuner_ops.set_params) { |
392 | fe->ops.tuner_ops.set_params(fe, p); | 392 | fe->ops.tuner_ops.set_params(fe); |
393 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); | 393 | if (fe->ops.i2c_gate_ctrl) fe->ops.i2c_gate_ctrl(fe, 0); |
394 | } | 394 | } |
395 | ves1x93_set_inversion (state, p->inversion); | 395 | ves1x93_set_inversion (state, p->inversion); |
diff --git a/drivers/media/dvb/frontends/zl10036.c b/drivers/media/dvb/frontends/zl10036.c index 129d0f2a87e4..0903d461b8fa 100644 --- a/drivers/media/dvb/frontends/zl10036.c +++ b/drivers/media/dvb/frontends/zl10036.c | |||
@@ -305,8 +305,7 @@ static int zl10036_set_gain_params(struct zl10036_state *state, | |||
305 | return zl10036_write(state, buf, sizeof(buf)); | 305 | return zl10036_write(state, buf, sizeof(buf)); |
306 | } | 306 | } |
307 | 307 | ||
308 | static int zl10036_set_params(struct dvb_frontend *fe, | 308 | static int zl10036_set_params(struct dvb_frontend *fe) |
309 | struct dvb_frontend_parameters *params) | ||
310 | { | 309 | { |
311 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 310 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
312 | struct zl10036_state *state = fe->tuner_priv; | 311 | struct zl10036_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/zl10039.c b/drivers/media/dvb/frontends/zl10039.c index 7fc8cef408b7..eff9c5fde50a 100644 --- a/drivers/media/dvb/frontends/zl10039.c +++ b/drivers/media/dvb/frontends/zl10039.c | |||
@@ -176,8 +176,7 @@ static int zl10039_sleep(struct dvb_frontend *fe) | |||
176 | return 0; | 176 | return 0; |
177 | } | 177 | } |
178 | 178 | ||
179 | static int zl10039_set_params(struct dvb_frontend *fe, | 179 | static int zl10039_set_params(struct dvb_frontend *fe) |
180 | struct dvb_frontend_parameters *params) | ||
181 | { | 180 | { |
182 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 181 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
183 | struct zl10039_state *state = fe->tuner_priv; | 182 | struct zl10039_state *state = fe->tuner_priv; |
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c index 9caccc03d588..0945aa0f9294 100644 --- a/drivers/media/dvb/frontends/zl10353.c +++ b/drivers/media/dvb/frontends/zl10353.c | |||
@@ -362,7 +362,7 @@ static int zl10353_set_parameters(struct dvb_frontend *fe, | |||
362 | */ | 362 | */ |
363 | if (state->config.no_tuner) { | 363 | if (state->config.no_tuner) { |
364 | if (fe->ops.tuner_ops.set_params) { | 364 | if (fe->ops.tuner_ops.set_params) { |
365 | fe->ops.tuner_ops.set_params(fe, param); | 365 | fe->ops.tuner_ops.set_params(fe); |
366 | if (fe->ops.i2c_gate_ctrl) | 366 | if (fe->ops.i2c_gate_ctrl) |
367 | fe->ops.i2c_gate_ctrl(fe, 0); | 367 | fe->ops.i2c_gate_ctrl(fe, 0); |
368 | } | 368 | } |