---

yaml --- r: 249407 b: refs/heads/master c: dc1e961 h: refs/heads/master i: 249405: 383d71e 249403: 26d85f1 249399: 902620a 249391: 221bb52 249375: 939c106 249343: bd5b9c4 v: v3
git-mirror · May 10, 2011 · 40a763b · 40a763b
1 parent c895488
commit 40a763b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 23 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83dcec0904db64c7b5867f9a7621af0c8998d26a
+refs/heads/master: dc1e961668d148fa5c2784ac51a9a78cb7274cf3
diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c
@@ -3117,25 +3117,6 @@ u8 wlc_phy_nbits(s32 value)
 	return nbits;
 }
 
-u32 wlc_phy_sqrt_int(u32 value)
-{
-	u32 root = 0, shift = 0;
-
-	for (shift = 0; shift < 32; shift += 2) {
-		if (((0x40000000 >> shift) + root) <= value) {
-			value -= ((0x40000000 >> shift) + root);
-			root = (root >> 1) | (0x40000000 >> shift);
-		} else {
-			root = root >> 1;
-		}
-	}
-
-	if (root < value)
-		++root;
-
-	return root;
-}
-
 void wlc_phy_stf_chain_init(wlc_phy_t *pih, u8 txchain, u8 rxchain)
 {
 	phy_info_t *pi = (phy_info_t *) pih;

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
@@ -1025,7 +1025,6 @@ extern void wlc_phy_txpower_update_shm(phy_info_t *pi);
 
 extern void wlc_phy_cordic(fixed theta, cs32 *val);
 extern u8 wlc_phy_nbits(s32 value);
-extern u32 wlc_phy_sqrt_int(u32 value);
 extern void wlc_phy_compute_dB(u32 *cmplx_pwr, s8 *p_dB, u8 core);
 
 extern uint wlc_phy_init_radio_regs_allbands(phy_info_t *pi,

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c
@@ -3244,7 +3244,7 @@ static bool wlc_lcnphy_calc_rx_iq_comp(phy_info_t *pi, u16 num_samps)
 	}
 	b /= temp;
 	b -= a * a;
-	b = (s32) wlc_phy_sqrt_int((u32) b);
+	b = (s32) int_sqrt((unsigned long) b);
 	b -= (1 << 10);
 	a0_new = (u16) (a & 0x3ff);
 	b0_new = (u16) (b & 0x3ff);

diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c b/trunk/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c
@@ -24608,7 +24608,7 @@ static void wlc_phy_calc_rx_iq_comp_nphy(phy_info_t *pi, u8 core_mask)
 		}
 		b /= temp;
 		b -= a * a;
-		b = (s32) wlc_phy_sqrt_int((u32) b);
+		b = (s32) int_sqrt((unsigned long) b);
 		b -= (1 << 10);
 
 		if ((curr_core == PHY_CORE_0) && (core_mask & 0x1)) {