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

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

diff --git a/[refs] b/[refs]
index 89e93d8a6df8..c6c7c4eddec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d2d42bcd8c73273f22d16ef4e619ce3f07f07d0
+refs/heads/master: d1c53424f3ba9cc46bf3dbc550a916dc1b8355ee
diff --git a/trunk/drivers/media/dvb/frontends/tda18271-fe.c b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
index 250899a90aa2..2f05c4cdb8b7 100644
--- a/trunk/drivers/media/dvb/frontends/tda18271-fe.c
+++ b/trunk/drivers/media/dvb/frontends/tda18271-fe.c
@@ -195,8 +195,8 @@ static int tda18271_read_thermometer(struct dvb_frontend *fe)
 	return tm;
 }
 
-static int tda18271_rf_tracking_filters_correction(struct dvb_frontend *fe,
-						   u32 freq)
+static int tda18271c2_rf_tracking_filters_correction(struct dvb_frontend *fe,
+						     u32 freq)
 {
 	struct tda18271_priv *priv = fe->tuner_priv;
 	struct tda18271_rf_tracking_filter_cal *map = priv->rf_cal_state;
@@ -630,26 +630,6 @@ static int tda18271_init(struct dvb_frontend *fe)
 	return 0;
 }
 
-static int tda18271c2_tune(struct dvb_frontend *fe,
-			   u32 ifc, u32 freq, u32 bw, u8 std, int radio)
-{
-	struct tda18271_priv *priv = fe->tuner_priv;
-
-	tda_dbg("freq = %d, ifc = %d\n", freq, ifc);
-
-	tda18271_init(fe);
-
-	mutex_lock(&priv->lock);
-
-	tda18271_rf_tracking_filters_correction(fe, freq);
-
-	tda18271_channel_configuration(fe, ifc, freq, bw, std, radio);
-
-	mutex_unlock(&priv->lock);
-
-	return 0;
-}
-
 /* ------------------------------------------------------------------ */
 
 static int tda18271c1_rf_tracking_filter_calibration(struct dvb_frontend *fe,
@@ -747,41 +727,33 @@ static int tda18271c1_rf_tracking_filter_calibration(struct dvb_frontend *fe,
 	return 0;
 }
 
-static int tda18271c1_tune(struct dvb_frontend *fe,
-			   u32 ifc, u32 freq, u32 bw, u8 std, int radio)
+/* ------------------------------------------------------------------ */
+
+static int tda18271_tune(struct dvb_frontend *fe,
+			 u32 ifc, u32 freq, u32 bw, u8 std, int radio)
 {
 	struct tda18271_priv *priv = fe->tuner_priv;
 
+	tda_dbg("freq = %d, ifc = %d, bw = %d, std = 0x%02x\n",
+		freq, ifc, bw, std);
+
 	tda18271_init(fe);
 
 	mutex_lock(&priv->lock);
 
-	tda_dbg("freq = %d, ifc = %d\n", freq, ifc);
-
-	tda18271c1_rf_tracking_filter_calibration(fe, freq, bw);
-
-	tda18271_channel_configuration(fe, ifc, freq, bw, std, radio);
-
-	mutex_unlock(&priv->lock);
-
-	return 0;
-}
-
-static inline int tda18271_tune(struct dvb_frontend *fe,
-				u32 ifc, u32 freq, u32 bw, u8 std, int radio)
-{
-	struct tda18271_priv *priv = fe->tuner_priv;
-	int ret = -EINVAL;
-
 	switch (priv->id) {
 	case TDA18271HDC1:
-		ret = tda18271c1_tune(fe, ifc, freq, bw, std, radio);
+		tda18271c1_rf_tracking_filter_calibration(fe, freq, bw);
 		break;
 	case TDA18271HDC2:
-		ret = tda18271c2_tune(fe, ifc, freq, bw, std, radio);
+		tda18271c2_rf_tracking_filters_correction(fe, freq);
 		break;
 	}
-	return ret;
+	tda18271_channel_configuration(fe, ifc, freq, bw, std, radio);
+
+	mutex_unlock(&priv->lock);
+
+	return 0;
 }
 
 /* ------------------------------------------------------------------ */