Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / dvb-usb / dvb-usb-i2c.c

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 088b6dee3a7fbfa289e3ff9c11b77b34405fb478..326f7608954b12e36ef72c1d45a152793a89c5be 100644 (file)
--- a/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -20,11 +20,7 @@ int dvb_usb_i2c_init(struct dvb_usb_device *d)
        }
 
        strncpy(d->i2c_adap.name, d->desc->name, sizeof(d->i2c_adap.name));
-#ifdef I2C_ADAP_CLASS_TV_DIGITAL
-       d->i2c_adap.class = I2C_ADAP_CLASS_TV_DIGITAL,
-#else
        d->i2c_adap.class = I2C_CLASS_TV_DIGITAL,
-#endif
        d->i2c_adap.algo      = d->props.i2c_algo;
        d->i2c_adap.algo_data = NULL;
        d->i2c_adap.dev.parent = &d->udev->dev;
@@ -46,82 +42,3 @@ int dvb_usb_i2c_exit(struct dvb_usb_device *d)
        d->state &= ~DVB_USB_STATE_I2C;
        return 0;
 }
-
-int dvb_usb_tuner_init_i2c(struct dvb_frontend *fe)
-{
-       struct dvb_usb_adapter *adap = fe->dvb->priv;
-       struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = adap->pll_init, .len = 4 };
-       int ret = 0;
-
-       /* if pll_desc is not used */
-       if (adap->pll_desc == NULL)
-               return 0;
-
-       if (adap->tuner_pass_ctrl)
-               adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
-
-       deb_pll("pll init: %x\n",adap->pll_addr);
-       deb_pll("pll-buf: %x %x %x %x\n",adap->pll_init[0], adap->pll_init[1],
-                       adap->pll_init[2], adap->pll_init[3]);
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
-       if (i2c_transfer (&adap->dev->i2c_adap, &msg, 1) != 1) {
-               err("tuner i2c write failed for pll_init.");
-               ret = -EREMOTEIO;
-       }
-       msleep(1);
-
-       if (adap->tuner_pass_ctrl)
-               adap->tuner_pass_ctrl(fe,0,adap->pll_addr);
-       return ret;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_init_i2c);
-
-int dvb_usb_tuner_calc_regs(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep, u8 *b, int buf_len)
-{
-       struct dvb_usb_adapter *adap = fe->dvb->priv;
-
-       if (buf_len != 5)
-               return -EINVAL;
-       if (adap->pll_desc == NULL)
-               return 0;
-
-       deb_pll("pll addr: %x, freq: %d %p\n",adap->pll_addr, fep->frequency, adap->pll_desc);
-
-       b[0] = adap->pll_addr;
-       dvb_pll_configure(adap->pll_desc, &b[1], fep->frequency, fep->u.ofdm.bandwidth);
-
-       deb_pll("pll-buf: %x %x %x %x %x\n",b[0],b[1],b[2],b[3],b[4]);
-
-       return 5;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_calc_regs);
-
-int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
-{
-       struct dvb_usb_adapter *adap = fe->dvb->priv;
-       int ret = 0;
-       u8 b[5];
-       struct i2c_msg msg = { .addr = adap->pll_addr, .flags = 0, .buf = &b[1], .len = 4 };
-
-       dvb_usb_tuner_calc_regs(fe,fep,b,5);
-
-       if (adap->tuner_pass_ctrl)
-               adap->tuner_pass_ctrl(fe, 1, adap->pll_addr);
-
-       if (fe->ops.i2c_gate_ctrl)
-               fe->ops.i2c_gate_ctrl(fe, 1);
-
-       if (i2c_transfer(&adap->dev->i2c_adap, &msg, 1) != 1) {
-               err("tuner i2c write failed for pll_set.");
-               ret = -EREMOTEIO;
-       }
-       msleep(1);
-
-       if (adap->tuner_pass_ctrl)
-               adap->tuner_pass_ctrl(fe, 0, adap->pll_addr);
-
-       return ret;
-}
-EXPORT_SYMBOL(dvb_usb_tuner_set_params_i2c);