diff options
| author | Arend van Spriel | 2011-10-04 23:18:51 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-10-05 22:39:01 +0200 |
| commit | e6cfdf6850ac5557ef6b660d30a5809822cb8bfb (patch) | |
| tree | 15ef46c683094f167750ef8b26bb73adad37d460 /drivers/staging/brcm80211/brcmsmac/phy | |
| parent | staging: brcm80211: remove brcmu_bprintf and related functions (diff) | |
| download | kernel-qcow2-linux-e6cfdf6850ac5557ef6b660d30a5809822cb8bfb.tar.gz kernel-qcow2-linux-e6cfdf6850ac5557ef6b660d30a5809822cb8bfb.tar.xz kernel-qcow2-linux-e6cfdf6850ac5557ef6b660d30a5809822cb8bfb.zip | |
staging: brcm80211: replace brcmu_bitcount with hweight8
The kernel provides bit operations to replace brcmu_bitcount so
using those instead.
Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/brcmsmac/phy')
| -rw-r--r-- | drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c index 45e3b4b294ff..0d3c9d87c5e4 100644 --- a/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c +++ b/drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c @@ -15,6 +15,7 @@ */ #include <linux/kernel.h> #include <linux/delay.h> +#include <linux/bitops.h> #include <brcm_hw_ids.h> #include <chipcommon.h> @@ -2879,8 +2880,7 @@ void wlc_phy_stf_chain_init(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain) pi->sh->hw_phyrxchain = rxchain; pi->sh->phytxchain = txchain; pi->sh->phyrxchain = rxchain; - pi->pubpi.phy_corenum = (u8) brcmu_bitcount((u8 *)&pi->sh->phyrxchain, - sizeof(u8)); + pi->pubpi.phy_corenum = (u8)hweight8(pi->sh->phyrxchain); } void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain) @@ -2892,8 +2892,7 @@ void wlc_phy_stf_chain_set(struct brcms_phy_pub *pih, u8 txchain, u8 rxchain) if (ISNPHY(pi)) wlc_phy_rxcore_setstate_nphy(pih, rxchain); - pi->pubpi.phy_corenum = (u8) brcmu_bitcount((u8 *)&pi->sh->phyrxchain, - sizeof(u8)); + pi->pubpi.phy_corenum = (u8)hweight8(pi->sh->phyrxchain); } void wlc_phy_stf_chain_get(struct brcms_phy_pub *pih, u8 *txchain, u8 *rxchain) |