From: Henry Ptasinski <henryp@broadcom.com>
Date: Fri, 8 Oct 2010 02:52:05 +0000 (-0700)
Subject: staging: brcm80211: Use linux/bitops.h instead of bitfuncs.h
X-Git-Tag: upstream/snapshot3+hdmi~12602^2~3^2~276
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d953a05d04b17b43f3bf4a183131e5c5e223ecaa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

staging: brcm80211: Use linux/bitops.h instead of bitfuncs.h

Use ffs() from linux/bitops.h, instead of the locally defined find_msbit().

Signed-off-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
index 6b8749a..1b90f79 100644
--- a/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
+++ b/drivers/staging/brcm80211/phy/wlc_phy_lcn.c
@@ -21,7 +21,7 @@
 #include <linux/string.h>
 #include <linuxver.h>
 #include <siutils.h>
-#include <bitfuncs.h>
+#include <linux/bitops.h>
 #include <hndpmu.h>
 
 #include <wlc_phy_radio.h>
@@ -5196,7 +5196,7 @@ int32 wlc_lcnphy_rx_signal_power(phy_info_t *pi, int32 gain_index)
 	{
 		uint32 power = (received_power * 16);
 		uint32 msb1, msb2, val1, val2, diff1, diff2;
-		msb1 = find_msbit(power);
+		msb1 = ffs(power) - 1;
 		msb2 = msb1 + 1;
 		val1 = 1 << msb1;
 		val2 = 1 << msb2;