From 929ce8e42b5432782c4a00fd1aa20b3ffc340cc8 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 20 Dec 2011 17:09:15 -0300
Subject: [PATCH] --- yaml --- r: 285453 b: refs/heads/master c:
 2676c258eb836caed508099e58030398217a5ef0 h: refs/heads/master i:   285451:
 66af38ea0e4231b0ecfe660fd80f22ba72d99dfe v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/media/common/tuners/mt2060.c      | 12 ++----------
 trunk/drivers/media/common/tuners/mt2060_priv.h |  1 -
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index a6c5950bad78..1b0619757408 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b80ff3ad52690d37e9617335ce9d66e6d4a92e5
+refs/heads/master: 2676c258eb836caed508099e58030398217a5ef0
diff --git a/trunk/drivers/media/common/tuners/mt2060.c b/trunk/drivers/media/common/tuners/mt2060.c
index 2ecaa53d1449..6fe2ef9f6259 100644
--- a/trunk/drivers/media/common/tuners/mt2060.c
+++ b/trunk/drivers/media/common/tuners/mt2060.c
@@ -155,6 +155,7 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2)
 
 static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
 {
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 	struct mt2060_priv *priv;
 	int ret=0;
 	int i=0;
@@ -176,8 +177,7 @@ static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
 
 	mt2060_writeregs(priv,b,2);
 
-	freq = params->frequency / 1000; // Hz -> kHz
-	priv->bandwidth = (fe->ops.info.type == FE_OFDM) ? params->u.ofdm.bandwidth : 0;
+	freq = c->frequency / 1000; /* Hz -> kHz */
 
 	f_lo1 = freq + if1 * 1000;
 	f_lo1 = (f_lo1 / 250) * 250;
@@ -293,13 +293,6 @@ static int mt2060_get_frequency(struct dvb_frontend *fe, u32 *frequency)
 	return 0;
 }
 
-static int mt2060_get_bandwidth(struct dvb_frontend *fe, u32 *bandwidth)
-{
-	struct mt2060_priv *priv = fe->tuner_priv;
-	*bandwidth = priv->bandwidth;
-	return 0;
-}
-
 static int mt2060_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
 {
 	*frequency = IF2 * 1000;
@@ -362,7 +355,6 @@ static const struct dvb_tuner_ops mt2060_tuner_ops = {
 
 	.set_params    = mt2060_set_params,
 	.get_frequency = mt2060_get_frequency,
-	.get_bandwidth = mt2060_get_bandwidth,
 	.get_if_frequency = mt2060_get_if_frequency,
 };
 
diff --git a/trunk/drivers/media/common/tuners/mt2060_priv.h b/trunk/drivers/media/common/tuners/mt2060_priv.h
index 5eaccdefd0b0..2b60de6c707d 100644
--- a/trunk/drivers/media/common/tuners/mt2060_priv.h
+++ b/trunk/drivers/media/common/tuners/mt2060_priv.h
@@ -97,7 +97,6 @@ struct mt2060_priv {
 	struct i2c_adapter   *i2c;
 
 	u32 frequency;
-	u32 bandwidth;
 	u16 if1_freq;
 	u8  fmfreq;
 };