From 0ebdca7608c77267a4a43d1ca8fecf3048187ad7 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 12 Jun 2007 12:40:35 -0300
Subject: [PATCH] --- yaml --- r: 61335 b: refs/heads/master c:
 865dd115c95df6997f3d9dd638e6f92298f0422f h: refs/heads/master i:   61333:
 9f5f35559adba449c029b6e6aaefae6cec85eebc   61331:
 e74fa09f754b1e262942190f5f8dd8c18dbebc41   61327:
 02349a1abdf4f18ed64f234aebd8faf674de4e17 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c | 59 -------------------
 trunk/drivers/media/dvb/dvb-usb/dvb-usb.h     |  8 ---
 3 files changed, 1 insertion(+), 68 deletions(-)

diff --git a/[refs] b/[refs]
index d14bd1d13cc6..6ad3dc121f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce15678926cef4886df46964142fc2520c216cd
+refs/heads/master: 865dd115c95df6997f3d9dd638e6f92298f0422f
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
index 5792951b990e..23428cd30756 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb-i2c.c
@@ -46,62 +46,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_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 };
-
-	fe->ops.tuner_ops.calc_regs(fe, fep, b, sizeof(b));
-
-	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);
diff --git a/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h b/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h
index d008a24c247a..70be200665e4 100644
--- a/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/trunk/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -297,10 +297,6 @@ struct dvb_usb_adapter {
 	int feedcount;
 	int pid_filtering;
 
-	/* tuner programming information */
-	u8 pll_addr;
-	u8 pll_init[4];
-	struct dvb_pll_desc *pll_desc;
 	int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);
 
 	/* dvb */
@@ -388,10 +384,6 @@ extern int dvb_usb_generic_write(struct dvb_usb_device *, u8 *, u16);
 /* commonly used remote control parsing */
 extern int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *, u8[], u32 *, int *);
 
-/* commonly used pll init and set functions */
-extern int dvb_usb_tuner_init_i2c(struct dvb_frontend *);
-extern int dvb_usb_tuner_set_params_i2c(struct dvb_frontend *, struct dvb_frontend_parameters *);
-
 /* commonly used firmware download types and function */
 struct hexline {
 	u8 len;