From 0fe4a08b805a620fd6c886983b95b72dbcd47300 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Wed, 20 Mar 2013 08:57:42 -0300
Subject: [PATCH] --- yaml --- r: 366640 b: refs/heads/master c:
 340e76965c868caa645268d2d36edb89af801fa4 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/media/dvb-frontends/drxk_hard.c | 33 ++-----------------
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/[refs] b/[refs]
index 4804ef087880..38c2dfea725a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59a7a23c4755f12757fe17234c693188a9e6bcf5
+refs/heads/master: 340e76965c868caa645268d2d36edb89af801fa4
diff --git a/trunk/drivers/media/dvb-frontends/drxk_hard.c b/trunk/drivers/media/dvb-frontends/drxk_hard.c
index 6e250533b628..fc93bd396cf4 100644
--- a/trunk/drivers/media/dvb-frontends/drxk_hard.c
+++ b/trunk/drivers/media/dvb-frontends/drxk_hard.c
@@ -2490,32 +2490,6 @@ static int SetAgcIf(struct drxk_state *state,
 	return status;
 }
 
-static int ReadIFAgc(struct drxk_state *state, u32 *pValue)
-{
-	u16 agcDacLvl;
-	int status;
-	u16 Level = 0;
-
-	dprintk(1, "\n");
-
-	status = read16(state, IQM_AF_AGC_IF__A, &agcDacLvl);
-	if (status < 0) {
-		printk(KERN_ERR "drxk: Error %d on %s\n", status, __func__);
-		return status;
-	}
-
-	*pValue = 0;
-
-	if (agcDacLvl > DRXK_AGC_DAC_OFFSET)
-		Level = agcDacLvl - DRXK_AGC_DAC_OFFSET;
-	if (Level < 14000)
-		*pValue = (14000 - Level) / 4;
-	else
-		*pValue = 0;
-
-	return status;
-}
-
 static int GetQAMSignalToNoise(struct drxk_state *state,
 			       s32 *pSignalToNoise)
 {
@@ -6484,7 +6458,7 @@ static int get_strength(struct drxk_state *state, u64 *strength)
 	 * If it can't be measured (AGC is disabled), just show 100%.
 	 */
 	if (totalGain > 0)
-		*strength = (65535UL * atten / totalGain);
+		*strength = (65535UL * atten / totalGain / 100);
 	else
 		*strength = 65535;
 
@@ -6633,7 +6607,7 @@ static int drxk_read_signal_strength(struct dvb_frontend *fe,
 				     u16 *strength)
 {
 	struct drxk_state *state = fe->demodulator_priv;
-	u32 val = 0;
+	struct dtv_frontend_properties *c = &fe->dtv_property_cache;
 
 	dprintk(1, "\n");
 
@@ -6642,8 +6616,7 @@ static int drxk_read_signal_strength(struct dvb_frontend *fe,
 	if (state->m_DrxkState == DRXK_UNINITIALIZED)
 		return -EAGAIN;
 
-	ReadIFAgc(state, &val);
-	*strength = val & 0xffff;
+	*strength = c->strength.stat[0].uvalue;
 	return 0;
 }