From 1af445894b3b06c08a9d604f8043e111850a7583 Mon Sep 17 00:00:00 2001 From: Michael Krufky Date: Mon, 7 May 2007 01:48:56 -0300 Subject: [PATCH] --- yaml --- r: 61265 b: refs/heads/master c: 9b98fd28b4a181cafaa5247a04d1be6d2ca7c863 h: refs/heads/master i: 61263: 69b89099470bd3b78a35d26ffb7e42b7423dd0f0 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ttpci/budget-av.c | 26 +++-------------------- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/[refs] b/[refs] index e40fb1533f49..53963a5d1378 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8511df9ec2ef4c33a6b1e76527d5b47da8bc0bb6 +refs/heads/master: 9b98fd28b4a181cafaa5247a04d1be6d2ca7c863 diff --git a/trunk/drivers/media/dvb/ttpci/budget-av.c b/trunk/drivers/media/dvb/ttpci/budget-av.c index 8de19cefb24d..1b590b2f8a5a 100644 --- a/trunk/drivers/media/dvb/ttpci/budget-av.c +++ b/trunk/drivers/media/dvb/ttpci/budget-av.c @@ -828,28 +828,6 @@ static u8 philips_sd1878_inittab[] = { 0xff, 0xff }; -static int philips_sd1878_tda8261_tuner_set_params(struct dvb_frontend *fe, - struct dvb_frontend_parameters *params) -{ - u8 buf[4]; - int rc; - struct i2c_msg tuner_msg = {.addr=0x60,.flags=0,.buf=buf,.len=sizeof(buf)}; - struct budget *budget = (struct budget *) fe->dvb->priv; - - if((params->frequency < 950000) || (params->frequency > 2150000)) - return -EINVAL; - - rc=dvb_pll_configure(&dvb_pll_philips_sd1878_tda8261, buf, params); - if(rc < 0) return rc; - - if (fe->ops.i2c_gate_ctrl) - fe->ops.i2c_gate_ctrl(fe, 1); - if(i2c_transfer(&budget->i2c_adap, &tuner_msg, 1) != 1) - return -EIO; - - return 0; -} - static int philips_sd1878_ci_set_symbol_rate(struct dvb_frontend *fe, u32 srate, u32 ratio) { @@ -984,7 +962,9 @@ static void frontend_init(struct budget_av *budget_av) fe = dvb_attach(stv0299_attach, &philips_sd1878_config, &budget_av->budget.i2c_adap); if (fe) { - fe->ops.tuner_ops.set_params = philips_sd1878_tda8261_tuner_set_params; + dvb_attach(dvb_pll_attach, fe, 0x60, + &budget_av->budget.i2c_adap, + &dvb_pll_philips_sd1878_tda8261); } break;