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/ttpci | |
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/ttpci')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 14 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-av.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-ci.c | 7 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget-patch.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/ttpci/budget.c | 10 |
5 files changed, 20 insertions, 22 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index c6191e1f162b..94b13ae1b2fb 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -1568,7 +1568,7 @@ static int get_firmware(struct av7110* av7110) | |||
1568 | return ret; | 1568 | return ret; |
1569 | } | 1569 | } |
1570 | 1570 | ||
1571 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1571 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
1572 | { | 1572 | { |
1573 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1573 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1574 | struct av7110* av7110 = fe->dvb->priv; | 1574 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1611,7 +1611,7 @@ static struct ves1x93_config alps_bsrv2_config = { | |||
1611 | .invert_pwm = 0, | 1611 | .invert_pwm = 0, |
1612 | }; | 1612 | }; |
1613 | 1613 | ||
1614 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1614 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) |
1615 | { | 1615 | { |
1616 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1616 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1617 | struct av7110* av7110 = fe->dvb->priv; | 1617 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1643,7 +1643,7 @@ static struct ves1820_config alps_tdbe2_config = { | |||
1643 | 1643 | ||
1644 | 1644 | ||
1645 | 1645 | ||
1646 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1646 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
1647 | { | 1647 | { |
1648 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1648 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1649 | struct av7110* av7110 = fe->dvb->priv; | 1649 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1670,7 +1670,7 @@ static struct tda8083_config grundig_29504_451_config = { | |||
1670 | 1670 | ||
1671 | 1671 | ||
1672 | 1672 | ||
1673 | static int philips_cd1516_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1673 | static int philips_cd1516_tuner_set_params(struct dvb_frontend *fe) |
1674 | { | 1674 | { |
1675 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1675 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1676 | struct av7110* av7110 = fe->dvb->priv; | 1676 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1702,7 +1702,7 @@ static struct ves1820_config philips_cd1516_config = { | |||
1702 | 1702 | ||
1703 | 1703 | ||
1704 | 1704 | ||
1705 | static int alps_tdlb7_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1705 | static int alps_tdlb7_tuner_set_params(struct dvb_frontend *fe) |
1706 | { | 1706 | { |
1707 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1707 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1708 | struct av7110* av7110 = fe->dvb->priv; | 1708 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1840,7 +1840,7 @@ static u8 nexusca_stv0297_inittab[] = { | |||
1840 | 0xff, 0xff, | 1840 | 0xff, 0xff, |
1841 | }; | 1841 | }; |
1842 | 1842 | ||
1843 | static int nexusca_stv0297_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1843 | static int nexusca_stv0297_tuner_set_params(struct dvb_frontend *fe) |
1844 | { | 1844 | { |
1845 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1845 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1846 | struct av7110* av7110 = fe->dvb->priv; | 1846 | struct av7110* av7110 = fe->dvb->priv; |
@@ -1896,7 +1896,7 @@ static struct stv0297_config nexusca_stv0297_config = { | |||
1896 | 1896 | ||
1897 | 1897 | ||
1898 | 1898 | ||
1899 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters *params) | 1899 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) |
1900 | { | 1900 | { |
1901 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 1901 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
1902 | struct av7110* av7110 = fe->dvb->priv; | 1902 | struct av7110* av7110 = fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c index a40ea6e1c0d1..8b32e282bf5d 100644 --- a/drivers/media/dvb/ttpci/budget-av.c +++ b/drivers/media/dvb/ttpci/budget-av.c | |||
@@ -502,8 +502,7 @@ static int philips_su1278_ty_ci_set_symbol_rate(struct dvb_frontend *fe, u32 sra | |||
502 | return 0; | 502 | return 0; |
503 | } | 503 | } |
504 | 504 | ||
505 | static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe, | 505 | static int philips_su1278_ty_ci_tuner_set_params(struct dvb_frontend *fe) |
506 | struct dvb_frontend_parameters *params) | ||
507 | { | 506 | { |
508 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 507 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
509 | u32 div; | 508 | u32 div; |
@@ -618,7 +617,7 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = { | |||
618 | .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate, | 617 | .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate, |
619 | }; | 618 | }; |
620 | 619 | ||
621 | static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 620 | static int philips_cu1216_tuner_set_params(struct dvb_frontend *fe) |
622 | { | 621 | { |
623 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 622 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
624 | struct budget *budget = (struct budget *) fe->dvb->priv; | 623 | struct budget *budget = (struct budget *) fe->dvb->priv; |
@@ -699,7 +698,7 @@ static int philips_tu1216_tuner_init(struct dvb_frontend *fe) | |||
699 | return 0; | 698 | return 0; |
700 | } | 699 | } |
701 | 700 | ||
702 | static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 701 | static int philips_tu1216_tuner_set_params(struct dvb_frontend *fe) |
703 | { | 702 | { |
704 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 703 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
705 | struct budget *budget = (struct budget *) fe->dvb->priv; | 704 | struct budget *budget = (struct budget *) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c index bf8b4934cb7c..98e524178765 100644 --- a/drivers/media/dvb/ttpci/budget-ci.c +++ b/drivers/media/dvb/ttpci/budget-ci.c | |||
@@ -660,8 +660,7 @@ static int philips_su1278_tt_set_symbol_rate(struct dvb_frontend *fe, u32 srate, | |||
660 | return 0; | 660 | return 0; |
661 | } | 661 | } |
662 | 662 | ||
663 | static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe, | 663 | static int philips_su1278_tt_tuner_set_params(struct dvb_frontend *fe) |
664 | struct dvb_frontend_parameters *params) | ||
665 | { | 664 | { |
666 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 665 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
667 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 666 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
@@ -742,7 +741,7 @@ static int philips_tdm1316l_tuner_init(struct dvb_frontend *fe) | |||
742 | return 0; | 741 | return 0; |
743 | } | 742 | } |
744 | 743 | ||
745 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 744 | static int philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
746 | { | 745 | { |
747 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 746 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
748 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 747 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
@@ -858,7 +857,7 @@ static struct tda1004x_config philips_tdm1316l_config_invert = { | |||
858 | .request_firmware = philips_tdm1316l_request_firmware, | 857 | .request_firmware = philips_tdm1316l_request_firmware, |
859 | }; | 858 | }; |
860 | 859 | ||
861 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params) | 860 | static int dvbc_philips_tdm1316l_tuner_set_params(struct dvb_frontend *fe) |
862 | { | 861 | { |
863 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 862 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
864 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; | 863 | struct budget_ci *budget_ci = (struct budget_ci *) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 4485cccf004e..2cb35c23d2ac 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -261,7 +261,7 @@ static int budget_patch_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_c | |||
261 | return 0; | 261 | return 0; |
262 | } | 262 | } |
263 | 263 | ||
264 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 264 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
265 | { | 265 | { |
266 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 266 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
267 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; | 267 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; |
@@ -303,7 +303,7 @@ static struct ves1x93_config alps_bsrv2_config = { | |||
303 | .invert_pwm = 0, | 303 | .invert_pwm = 0, |
304 | }; | 304 | }; |
305 | 305 | ||
306 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 306 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
307 | { | 307 | { |
308 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; | 308 | struct dtv_frontend_properties *p = &fe->dtv_property_cache; |
309 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; | 309 | struct budget_patch* budget = (struct budget_patch*) fe->dvb->priv; |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index ff41eee75102..b21bcce66708 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
@@ -200,7 +200,7 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m | |||
200 | return 0; | 200 | return 0; |
201 | } | 201 | } |
202 | 202 | ||
203 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 203 | static int alps_bsrv2_tuner_set_params(struct dvb_frontend *fe) |
204 | { | 204 | { |
205 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 205 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
206 | struct budget* budget = (struct budget*) fe->dvb->priv; | 206 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -242,7 +242,7 @@ static struct ves1x93_config alps_bsrv2_config = | |||
242 | .invert_pwm = 0, | 242 | .invert_pwm = 0, |
243 | }; | 243 | }; |
244 | 244 | ||
245 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 245 | static int alps_tdbe2_tuner_set_params(struct dvb_frontend *fe) |
246 | { | 246 | { |
247 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 247 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
248 | struct budget* budget = (struct budget*) fe->dvb->priv; | 248 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -270,7 +270,7 @@ static struct ves1820_config alps_tdbe2_config = { | |||
270 | .selagc = VES1820_SELAGC_SIGNAMPERR, | 270 | .selagc = VES1820_SELAGC_SIGNAMPERR, |
271 | }; | 271 | }; |
272 | 272 | ||
273 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 273 | static int grundig_29504_401_tuner_set_params(struct dvb_frontend *fe) |
274 | { | 274 | { |
275 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 275 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
276 | struct budget *budget = fe->dvb->priv; | 276 | struct budget *budget = fe->dvb->priv; |
@@ -328,7 +328,7 @@ static struct l64781_config grundig_29504_401_config_activy = { | |||
328 | 328 | ||
329 | static u8 tuner_address_grundig_29504_401_activy = 0x60; | 329 | static u8 tuner_address_grundig_29504_401_activy = 0x60; |
330 | 330 | ||
331 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 331 | static int grundig_29504_451_tuner_set_params(struct dvb_frontend *fe) |
332 | { | 332 | { |
333 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 333 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
334 | struct budget* budget = (struct budget*) fe->dvb->priv; | 334 | struct budget* budget = (struct budget*) fe->dvb->priv; |
@@ -352,7 +352,7 @@ static struct tda8083_config grundig_29504_451_config = { | |||
352 | .demod_address = 0x68, | 352 | .demod_address = 0x68, |
353 | }; | 353 | }; |
354 | 354 | ||
355 | static int s5h1420_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) | 355 | static int s5h1420_tuner_set_params(struct dvb_frontend *fe) |
356 | { | 356 | { |
357 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; | 357 | struct dtv_frontend_properties *c = &fe->dtv_property_cache; |
358 | struct budget* budget = (struct budget*) fe->dvb->priv; | 358 | struct budget* budget = (struct budget*) fe->dvb->priv; |