From c6f78d9ab663e17f1bf57e464cb1fa1760ddf828 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 4 Jan 2012 22:29:32 -0200
Subject: [PATCH] --- yaml --- r: 285647 b: refs/heads/master c:
 669b67d95948fd735ec9e103f00aca5b8074530c h: refs/heads/master i:   285645:
 6708f428da0bb6f6ca2cb67d4fb61b997df2fbea   285643:
 2c1f0c663082d59b18351b5db55ef3705df4a6f8   285639:
 0695ce32e2ab7bb283779da083f1102a3c52e2a7   285631:
 3abf507ca2e180156cb580036b2862ba83ce8de2 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/media/common/tuners/mt2063.c | 46 ++++++++--------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index c5ac08437d84..14e848c6c9a8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d76f28f2c3f19f4e2043a220e92e3fc8ec73ba90
+refs/heads/master: 669b67d95948fd735ec9e103f00aca5b8074530c
diff --git a/trunk/drivers/media/common/tuners/mt2063.c b/trunk/drivers/media/common/tuners/mt2063.c
index b2678a468a0e..75cb1d2ccdbc 100644
--- a/trunk/drivers/media/common/tuners/mt2063.c
+++ b/trunk/drivers/media/common/tuners/mt2063.c
@@ -2051,9 +2051,9 @@ static int mt2063_set_analog_params(struct dvb_frontend *fe,
  */
 #define MAX_SYMBOL_RATE_6MHz	5217391
 
-static int mt2063_set_params(struct dvb_frontend *fe,
-			     struct dvb_frontend_parameters *params)
+static int mt2063_set_params(struct dvb_frontend *fe)
 {
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 	struct mt2063_state *state = fe->tuner_priv;
 	int status;
 	s32 pict_car = 0;
@@ -2065,37 +2065,25 @@ static int mt2063_set_params(struct dvb_frontend *fe,
 	s32 if_mid = 0;
 	s32 rcvr_mode = 0;
 
-	switch (fe->ops.info.type) {
-	case FE_OFDM:
-		switch (params->u.ofdm.bandwidth) {
-		case BANDWIDTH_6_MHZ:
-			ch_bw = 6000000;
-			break;
-		case BANDWIDTH_7_MHZ:
-			ch_bw = 7000000;
-			break;
-		case BANDWIDTH_8_MHZ:
-			ch_bw = 8000000;
-			break;
-		default:
-			return -EINVAL;
-		}
+	if (c->bandwidth_hz == 0)
+		return -EINVAL;
+	if (c->bandwidth_hz <= 6000000)
+		ch_bw = 6000000;
+	else if (c->bandwidth_hz <= 7000000)
+		ch_bw = 7000000;
+	else
+		ch_bw = 8000000;
+
+	switch (c->delivery_system) {
+	case SYS_DVBT:
 		rcvr_mode = MT2063_OFFAIR_COFDM;
 		pict_car = 36125000;
 		pict2chanb_vsb = -(ch_bw / 2);
 		pict2snd1 = 0;
 		pict2snd2 = 0;
 		break;
-	case FE_QAM:
-		/*
-		 * Using a 8MHz bandwidth sometimes fail
-		 * with 6MHz-spaced channels, due to inter-carrier
-		 * interference. So, it is better to narrow-down the filter
-		 */
-		if (params->u.qam.symbol_rate <= MAX_SYMBOL_RATE_6MHz)
-			ch_bw = 6000000;
-		else
-			ch_bw = 8000000;
+	case SYS_DVBC_ANNEX_A:
+	case SYS_DVBC_ANNEX_C:
 		rcvr_mode = MT2063_CABLE_QAM;
 		pict_car = 36125000;
 		pict2snd1 = 0;
@@ -2115,12 +2103,12 @@ static int mt2063_set_params(struct dvb_frontend *fe,
 	if (status < 0)
 		return status;
 
-	status = MT2063_Tune(state, (params->frequency + (pict2chanb_vsb + (ch_bw / 2))));
+	status = MT2063_Tune(state, (c->frequency + (pict2chanb_vsb + (ch_bw / 2))));
 
 	if (status < 0)
 		return status;
 
-	state->frequency = params->frequency;
+	state->frequency = c->frequency;
 	return 0;
 }