Commit 8d3d6a69 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ce0f1b8c

drivers/staging/brcm80211/brcmfmac/bcmutils.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ const char *bcmerrorstr(int bcmerror) 
{

	/* check if someone added a bcmerror code but

		 forgot to add errorstring */

	ASSERT(ABS(BCME_LAST) == (ARRAYSIZE(bcmerrorstrtable) - 1));

	ASSERT(ABS(BCME_LAST) == (ARRAY_SIZE(bcmerrorstrtable) - 1));



	if (bcmerror > 0 || bcmerror < BCME_LAST) {

		snprintf(bcm_undeferrstr, BCME_STRLEN, "Undefined error %d",

drivers/staging/brcm80211/brcmfmac/dhd_common.c

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ static void wl_show_host_event(wl_event_msg_t *event, void *event_data) 
		(unsigned char) event->addr.octet[5] & 0xff);



	event_name = "UNKNOWN";

	for (i = 0; i < ARRAYSIZE(event_names); i++) {

	for (i = 0; i < ARRAY_SIZE(event_names); i++) {

		if (event_names[i].event == event_type)

			event_name = event_names[i].event_name;

	}

drivers/staging/brcm80211/brcmfmac/wl_iw.c

+3 −3
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ wl_iw_set_spy(struct net_device *dev, 
	if (!extra)

		return -EINVAL;



	iw->spy_num = min(ARRAYSIZE(iw->spy_addr), dwrq->length);

	iw->spy_num = min(ARRAY_SIZE(iw->spy_addr), dwrq->length);

	for (i = 0; i < iw->spy_num; i++)

		memcpy(&iw->spy_addr[i], addr[i].sa_data, ETHER_ADDR_LEN);

	memset(iw->spy_qual, 0, sizeof(iw->spy_qual));
@@ -3165,7 +3165,7 @@ static const iw_handler wl_iw_handler[] = { 
#if WIRELESS_EXT > 12



const struct iw_handler_def wl_iw_handler_def = {

	.num_standard = ARRAYSIZE(wl_iw_handler),

	.num_standard = ARRAY_SIZE(wl_iw_handler),

	.standard = (iw_handler *) wl_iw_handler,

	.num_private = 0,

	.num_private_args = 0,
@@ -3189,7 +3189,7 @@ int wl_iw_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
	WL_TRACE(("\n%s, cmd:%x alled via dhd->do_ioctl()entry point\n",

		  __func__, cmd));

	if (cmd < SIOCIWFIRST ||

		IW_IOCTL_IDX(cmd) >= ARRAYSIZE(wl_iw_handler)) {

		IW_IOCTL_IDX(cmd) >= ARRAY_SIZE(wl_iw_handler)) {

		WL_ERROR(("%s: error in cmd=%x : out of range\n", __func__,

			cmd));

		return -EOPNOTSUPP;

drivers/staging/brcm80211/include/bcmutils.h

+0 −3
Original line number Diff line number Diff line
@@ -456,9 +456,6 @@ extern "C" { 
	& ~((boundary) - 1))

#define	ISPOWEROF2(x)		((((x)-1)&(x)) == 0)

#define VALID_MASK(mask)	(!((mask) & ((mask) + 1)))

#ifndef ARRAYSIZE

#define ARRAYSIZE(a)		(sizeof(a)/sizeof(a[0]))

#endif



/* bit map related macros */

#ifndef setbit

drivers/staging/brcm80211/phy/wlc_phy_cmn.c

+7 −7
Original line number Diff line number Diff line
@@ -1521,7 +1521,7 @@ int wlc_phy_channel2freq(uint channel) 
{

	uint i;



	for (i = 0; i < ARRAYSIZE(chan_info_all); i++)

	for (i = 0; i < ARRAY_SIZE(chan_info_all); i++)

		if (chan_info_all[i].chan == channel)

			return chan_info_all[i].freq;

	return 0;
@@ -1538,7 +1538,7 @@ wlc_phy_chanspec_band_validch(wlc_phy_t *ppi, uint band, chanvec_t *channels) 


	bzero(channels, sizeof(chanvec_t));



	for (i = 0; i < ARRAYSIZE(chan_info_all); i++) {

	for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {

		channel = chan_info_all[i].chan;



		if ((pi->a_band_high_disable) && (channel >= FIRST_REF5_CHANNUM)
@@ -1560,19 +1560,19 @@ chanspec_t wlc_phy_chanspec_band_firstch(wlc_phy_t *ppi, uint band) 


	ASSERT((band == WLC_BAND_2G) || (band == WLC_BAND_5G));



	for (i = 0; i < ARRAYSIZE(chan_info_all); i++) {

	for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {

		channel = chan_info_all[i].chan;



		if (ISNPHY(pi) && IS40MHZ(pi)) {

			uint j;



			for (j = 0; j < ARRAYSIZE(chan_info_all); j++) {

			for (j = 0; j < ARRAY_SIZE(chan_info_all); j++) {

				if (chan_info_all[j].chan ==

				    channel + CH_10MHZ_APART)

					break;

			}



			if (j == ARRAYSIZE(chan_info_all))

			if (j == ARRAY_SIZE(chan_info_all))

				continue;



			channel = UPPER_20_SB(channel);
@@ -1725,12 +1725,12 @@ wlc_phy_txpower_sromlimit(wlc_phy_t *ppi, uint channel, u8 *min_pwr, 
		if (txp_rate_idx < 0)

			txp_rate_idx = TXP_FIRST_OFDM;



		for (i = 0; i < ARRAYSIZE(chan_info_all); i++) {

		for (i = 0; i < ARRAY_SIZE(chan_info_all); i++) {

			if (channel == chan_info_all[i].chan) {

				break;

			}

		}

		ASSERT(i < ARRAYSIZE(chan_info_all));

		ASSERT(i < ARRAY_SIZE(chan_info_all));



		if (pi->hwtxpwr) {

			*max_pwr = pi->hwtxpwr[i];