From 75202470723e8ae478e9f9959b91f338ab8be440 Mon Sep 17 00:00:00 2001
From: Christian Lamparter <chunkeey@googlemail.com>
Date: Fri, 29 Oct 2010 23:11:23 +0200
Subject: [PATCH] --- yaml --- r: 224343 b: refs/heads/master c:
 b1d771ee33c6e4006676002b9d74abf45b71d3d6 h: refs/heads/master i:   224341:
 648f18fa764fc0b84aaf3ead283b011857cc9cf0   224339:
 3ee253165d7a1c70942e0d8279d201cd28a3e142   224335:
 7d434b079e176e8e36763f4306ed249dc2e423d6 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/net/wireless/ath/carl9170/phy.c | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a5de5741764e..7cb83819bfcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7919a57bc608140aa8614c19eac40c6916fb61d2
+refs/heads/master: b1d771ee33c6e4006676002b9d74abf45b71d3d6
diff --git a/trunk/drivers/net/wireless/ath/carl9170/phy.c b/trunk/drivers/net/wireless/ath/carl9170/phy.c
index 89deca37a988..82bc81c4c930 100644
--- a/trunk/drivers/net/wireless/ath/carl9170/phy.c
+++ b/trunk/drivers/net/wireless/ath/carl9170/phy.c
@@ -1554,15 +1554,6 @@ static int carl9170_set_power_cal(struct ar9170 *ar, u32 freq,
 	return carl9170_regwrite_result();
 }
 
-/* TODO: replace this with sign_extend32(noise, 8) */
-static int carl9170_calc_noise_dbm(u32 raw_noise)
-{
-	if (raw_noise & 0x100)
-		return ~0x1ff | raw_noise;
-	else
-		return raw_noise;
-}
-
 int carl9170_get_noisefloor(struct ar9170 *ar)
 {
 	static const u32 phy_regs[] = {
@@ -1578,11 +1569,11 @@ int carl9170_get_noisefloor(struct ar9170 *ar)
 		return err;
 
 	for (i = 0; i < 2; i++) {
-		ar->noise[i] = carl9170_calc_noise_dbm(
-			(phy_res[i] >> 19) & 0x1ff);
+		ar->noise[i] = sign_extend32(GET_VAL(
+			AR9170_PHY_CCA_MIN_PWR, phy_res[i]), 8);
 
-		ar->noise[i + 2] = carl9170_calc_noise_dbm(
-			(phy_res[i + 2] >> 23) & 0x1ff);
+		ar->noise[i + 2] = sign_extend32(GET_VAL(
+			AR9170_PHY_EXT_CCA_MIN_PWR, phy_res[i + 2]), 8);
 	}
 
 	return 0;