From 60d70ba79c42dee1ec7f6fbf2d12afdcba05b721 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 22 Apr 2008 14:42:06 -0300
Subject: [PATCH] --- yaml --- r: 92379 b: refs/heads/master c:
 a60b866567001e97b5bdc9811aee155ae759e48f h: refs/heads/master i:   92377:
 5caac697285b0c5eec309dde5f1e30249b2b9057   92375:
 bab6db8e1f549a5f0fcc5ed77c38a9366c2b54b7 v: v3

---
 [refs]                                        |  2 +-
 .../drivers/media/dvb/frontends/tda18271-fe.c | 48 +------------------
 2 files changed, 2 insertions(+), 48 deletions(-)

diff --git a/[refs] b/[refs]
index a837d943707f..5612627cebef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e723ee00893f242cbccf5ef2faffdaa6afb8f244
+refs/heads/master: a60b866567001e97b5bdc9811aee155ae759e48f
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-fe.c b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
index 7f7fab7cd5af..26042a977e4e 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
@@ -752,54 +752,8 @@ static int tda18271c1_tune(struct dvb_frontend *fe,
 	if (0 == tda18271_calc_rf_cal(fe, &freq))
 		tda18271_write_regs(fe, R_EB14, 1);
 
-	/* Channel Configuration */
-
-	switch (priv->mode) {
-	case TDA18271_ANALOG:
-		regs[R_EB22]  = 0x2c;
-		break;
-	case TDA18271_DIGITAL:
-		regs[R_EB22]  = 0x37;
-		break;
-	}
-	tda18271_write_regs(fe, R_EB22, 1);
-
-	regs[R_EP1]  |= 0x40; /* set dis power level on */
-
-	/* set standard */
-	regs[R_EP3]  &= ~0x1f; /* clear std bits */
-
-	/* see table 22 */
-	regs[R_EP3]  |= std;
-
-	regs[R_EP4]  &= ~0x03; /* set cal mode to normal */
-
-	regs[R_EP4]  &= ~0x1c; /* clear if level bits */
-	switch (priv->mode) {
-	case TDA18271_ANALOG:
-		regs[R_MPD]  &= ~0x80; /* IF notch = 0 */
-		break;
-	case TDA18271_DIGITAL:
-		regs[R_EP4]  |= 0x04;
-		regs[R_MPD]  |= 0x80;
-		break;
-	}
-
-	if (radio)
-		regs[R_EP4]  |=  0x80;
-	else
-		regs[R_EP4]  &= ~0x80;
-
-	/* image rejection validity */
-	tda18271_calc_ir_measure(fe, &freq);
-
-	/* calculate MAIN PLL */
-	N = freq + ifc;
-
-	tda18271_calc_main_pll(fe, N);
+	tda18271_channel_configuration(fe, ifc, freq, bw, std, radio);
 
-	tda18271_write_regs(fe, R_TM, 15);
-	msleep(5);
 	mutex_unlock(&priv->lock);
 
 	return 0;