From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 18 Apr 2006 20:47:08 +0000 (-0300)
Subject: V4L/DVB (3843): Cxusb: use fe_lgh06xf.h
X-Git-Tag: v2.6.18-rc1~862^2~201
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55bbcdefc525236bd6ed691456923322be4a82c7;p=linux-2.6

V4L/DVB (3843): Cxusb: use fe_lgh06xf.h

- removed duplicated tuning code for LG TDVS H064F

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index 4b232a7ec5..a99fada427 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -27,6 +27,7 @@
 
 #include "cx22702.h"
 #include "lgdt330x.h"
+#include "fe_lgh06xf.h"
 #include "mt352.h"
 #include "mt352_priv.h"
 
@@ -326,30 +327,7 @@ static int cxusb_lgh064f_pll_set_i2c(struct dvb_frontend *fe,
 				     struct dvb_frontend_parameters *fep)
 {
 	struct dvb_usb_device *d = fe->dvb->priv;
-	int ret = 0;
-	u8 b[5];
-	struct i2c_msg msg = { .addr = d->pll_addr, .flags = 0,
-			       .buf = &b[1], .len = 4 };
-
-	dvb_usb_pll_set(fe,fep,b);
-
-	if (i2c_transfer (&d->i2c_adap, &msg, 1) != 1) {
-		err("tuner i2c write failed for pll_set.");
-		ret = -EREMOTEIO;
-	}
-	msleep(1);
-
-	/* Set the Auxiliary Byte. */
-	b[3] &= ~0x20;
-	b[3] |= 0x18;
-	b[4] = 0x50;
-	if (i2c_transfer(&d->i2c_adap, &msg, 1) != 1) {
-		err("tuner i2c write failed writing auxiliary byte.");
-		ret = -EREMOTEIO;
-	}
-	msleep(1);
-
-	return ret;
+	return lg_h06xf_pll_set(fe, &d->i2c_adap, fep);
 }
 
 static struct cx22702_config cxusb_cx22702_config = {
@@ -390,13 +368,6 @@ static int cxusb_fmd1216me_tuner_attach(struct dvb_usb_device *d)
 	return 0;
 }
 
-static int cxusb_lgh064f_tuner_attach(struct dvb_usb_device *d)
-{
-	d->pll_addr = 0x61;
-	d->pll_desc = &dvb_pll_tdvs_tua6034;
-	return 0;
-}
-
 static int cxusb_dee1601_tuner_attach(struct dvb_usb_device *d)
 {
 	d->pll_addr = 0x61;
@@ -581,7 +552,6 @@ static struct dvb_usb_properties cxusb_bluebird_lgh064f_properties = {
 	.streaming_ctrl   = cxusb_streaming_ctrl,
 	.power_ctrl       = cxusb_bluebird_power_ctrl,
 	.frontend_attach  = cxusb_lgdt3303_frontend_attach,
-	.tuner_attach     = cxusb_lgh064f_tuner_attach,
 
 	.i2c_algo         = &cxusb_i2c_algo,