summaryrefslogtreecommitdiffstats
path: root/drivers/staging/brcm80211/sys/wlc_bmac.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-10-08 11:47:11 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-10-08 11:47:11 -0700
commit8d3d6a6945df5c78c7f7882dabdb5638b05b2f5c (patch)
tree4b1c423dda2541ab504c6961752afc41ddf63e0b /drivers/staging/brcm80211/sys/wlc_bmac.c
parentce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f (diff)
downloadop-kernel-dev-8d3d6a6945df5c78c7f7882dabdb5638b05b2f5c.zip
op-kernel-dev-8d3d6a6945df5c78c7f7882dabdb5638b05b2f5c.tar.gz
Staging: brcm80211: remove ARRAYSIZE macro
Use the real 'ARRAY_SIZE' definition instead. Cc: Brett Rudley <brudley@broadcom.com> Cc: Henry Ptasinski <henryp@broadcom.com> Cc: Nohee Ko <noheek@broadcom.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/sys/wlc_bmac.c')
-rw-r--r--drivers/staging/brcm80211/sys/wlc_bmac.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/brcm80211/sys/wlc_bmac.c b/drivers/staging/brcm80211/sys/wlc_bmac.c
index 33c03f4..871ee99 100644
--- a/drivers/staging/brcm80211/sys/wlc_bmac.c
+++ b/drivers/staging/brcm80211/sys/wlc_bmac.c
@@ -926,7 +926,7 @@ BCMATTACHFN(wlc_bmac_attach) (wlc_info_t *wlc, u16 vendor, u16 device,
/* init tx fifo size */
ASSERT((wlc_hw->corerev - XMTFIFOTBL_STARTREV) <
- ARRAYSIZE(xmtfifo_sz));
+ ARRAY_SIZE(xmtfifo_sz));
wlc_hw->xmtfifo_sz =
xmtfifo_sz[(wlc_hw->corerev - XMTFIFOTBL_STARTREV)];
@@ -1500,7 +1500,7 @@ wlc_bmac_mhf(wlc_hw_info_t *wlc_hw, u8 idx, u16 mask, u16 val,
ASSERT((val & ~mask) == 0);
ASSERT(idx < MHFMAX);
- ASSERT(ARRAYSIZE(addr) == MHFMAX);
+ ASSERT(ARRAY_SIZE(addr) == MHFMAX);
switch (bands) {
/* Current band only or all bands,
@@ -1576,7 +1576,7 @@ static void wlc_write_mhf(wlc_hw_info_t *wlc_hw, u16 *mhfs)
M_HOST_FLAGS5
};
- ASSERT(ARRAYSIZE(addr) == MHFMAX);
+ ASSERT(ARRAY_SIZE(addr) == MHFMAX);
for (idx = 0; idx < MHFMAX; idx++) {
wlc_bmac_write_shm(wlc_hw, addr[idx], mhfs[idx]);
@@ -3595,7 +3595,7 @@ static void wlc_upd_ofdm_pctl1_table(wlc_hw_info_t *wlc_hw)
return;
/* walk the phy rate table and update the entries */
- for (i = 0; i < ARRAYSIZE(rates); i++) {
+ for (i = 0; i < ARRAY_SIZE(rates); i++) {
rate = rates[i];
entry_ptr = wlc_bmac_ofdm_ratetable_offset(wlc_hw, rate);
@@ -3634,7 +3634,7 @@ static u16 wlc_bmac_ofdm_ratetable_offset(wlc_hw_info_t *wlc_hw, u8 rate)
{WLC_RATE_54M, 0xC}
};
- for (i = 0; i < ARRAYSIZE(rate_lookup); i++) {
+ for (i = 0; i < ARRAY_SIZE(rate_lookup); i++) {
if (rate == rate_lookup[i].rate) {
plcp_rate = rate_lookup[i].signal_rate;
break;
OpenPOWER on IntegriCloud