[PATCH 11/16] trivial: use ARRAY_SIZE

[PATCH 11/16] trivial: use ARRAY_SIZE

[Kulikov Vasiliy]

Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).

Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
---
 drivers/staging/otus/hal/hpreg.c |   17 +++++++----------
 1 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/otus/hal/hpreg.c b/drivers/staging/otus/hal/hpreg.c
index da3b774..9b04653 100644
--- a/drivers/staging/otus/hal/hpreg.c
+++ b/drivers/staging/otus/hal/hpreg.c
@@ -29,9 +29,6 @@
 #include "hpreg.h"
 #include "hpusb.h"
 
-/* used throughout this file... */
-#define	N(a)	(sizeof(a) / sizeof(a[0]))
-
 #define HAL_MODE_11A_TURBO	HAL_MODE_108A
 #define HAL_MODE_11G_TURBO	HAL_MODE_108G
 
@@ -1557,7 +1554,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
 	u64_t flags = NO_REQ;
 	REG_DMN_PAIR_MAPPING *regPair = NULL;
 
-	for (i = 0, found = 0; (i < N(regDomainPairs)) && (!found); i++) {
+	for (i = 0, found = 0; (i < ARRAY_SIZE(regDomainPairs)) && (!found); i++) {
 		if (regDomainPairs[i].regDmnEnum == regionCode) {
 			regPair = &regDomainPairs[i];
 			found = 1;
@@ -1581,7 +1578,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
 	 * unitary reg domain of the pair
 	 */
 
-	for (i = 0 ; i < N(regDomains) ; i++) {
+	for (i = 0 ; i < ARRAY_SIZE(regDomains) ; i++) {
 		if (regDomains[i].regDmnEnum == regDmn) {
 			if (rd != NULL) {
 					zfMemoryCopy((u8_t *)rd, (u8_t *)&regDomains[i],
@@ -1653,7 +1650,7 @@ void zfHpGetRegulationTable(zdev_t *dev, u16_t regionCode, u16_t c_lo, u16_t c_h
 
 	zmw_enter_critical_section(dev);
 
-	for (cm = modes; cm < &modes[N(modes)]; cm++) {
+	for (cm = modes; cm < &modes[ARRAY_SIZE(modes)]; cm++) {
 		u16_t c;
 		u64_t *channelBM = NULL;
 		REG_DOMAIN *rd = NULL;
@@ -1846,7 +1843,7 @@ void zfHpGetRegulationTablefromCountry(zdev_t *dev, u16_t CountryCode)
 
 	zmw_declare_for_critical_section();
 
-	for (i = 0; i < N(allCountries); i++) {
+	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
 		if (CountryCode == allCountries[i].countryCode) {
 			RegDomain = allCountries[i].regDmnEnum;
 
@@ -1881,7 +1878,7 @@ u8_t zfHpGetRegulationTablefromISO(zdev_t *dev, u8_t *countryInfo, u8_t length)
 		strLen = 3; */
 	}
 	/* zm_debug_msg_s("Desired iso name = ", isoName); */
-	for (i = 0; i < N(allCountries); i++) {
+	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
 		/* zm_debug_msg_s("Current iso name = ", allCountries[i].isoName); */
 		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, (u8_t *)&countryInfo[2], length-1)) {
 			/* DbgPrint("Set current iso name = %s\n", allCountries[i].isoName); */
@@ -1937,7 +1934,7 @@ const char *zfHpGetisoNamefromregionCode(zdev_t *dev, u16_t regionCode)
 {
 	u16_t i;
 
-	for (i = 0; i < N(allCountries); i++) {
+	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
 		if (allCountries[i].regDmnEnum == regionCode)
 			return allCountries[i].isoName;
 	}
@@ -1953,7 +1950,7 @@ u16_t zfHpGetRegionCodeFromIsoName(zdev_t *dev, u8_t *countryIsoName)
 	/* if no matching item, return default */
 	regionCode = DEF_REGDMN;
 
-	for (i = 0; i < N(allCountries); i++) {
+	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
 		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, countryIsoName, 2)) {
 			regionCode = allCountries[i].regDmnEnum;
 		break;
-- 
1.7.0.4

Re: [PATCH 11/16] trivial: use ARRAY_SIZE

[walter harms]

Kulikov Vasiliy schrieb:
> Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
> ---
>  drivers/staging/otus/hal/hpreg.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/otus/hal/hpreg.c b/drivers/staging/otus/hal/hpreg.c
> index da3b774..9b04653 100644
> --- a/drivers/staging/otus/hal/hpreg.c
> +++ b/drivers/staging/otus/hal/hpreg.c
> @@ -29,9 +29,6 @@
>  #include "hpreg.h"
>  #include "hpusb.h"
>  
> -/* used throughout this file... */
> -#define	N(a)	(sizeof(a) / sizeof(a[0]))
> -
>  #define HAL_MODE_11A_TURBO	HAL_MODE_108A
>  #define HAL_MODE_11G_TURBO	HAL_MODE_108G
>  
> @@ -1557,7 +1554,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
>  	u64_t flags = NO_REQ;
>  	REG_DMN_PAIR_MAPPING *regPair = NULL;
>  
> -	for (i = 0, found = 0; (i < N(regDomainPairs)) && (!found); i++) {
> +	for (i = 0, found = 0; (i < ARRAY_SIZE(regDomainPairs)) && (!found); i++) {
>  		if (regDomainPairs[i].regDmnEnum == regionCode) {
>  			regPair = &regDomainPairs[i];
>  			found = 1;



This looks odd, i do not see the rest of the code but perhaps a break would help
to eleminate the "found" ??

just my two cents,
 wh


> @@ -1581,7 +1578,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
>  	 * unitary reg domain of the pair
>  	 */
>  
> -	for (i = 0 ; i < N(regDomains) ; i++) {
> +	for (i = 0 ; i < ARRAY_SIZE(regDomains) ; i++) {
>  		if (regDomains[i].regDmnEnum == regDmn) {
>  			if (rd != NULL) {
>  					zfMemoryCopy((u8_t *)rd, (u8_t *)&regDomains[i],
> @@ -1653,7 +1650,7 @@ void zfHpGetRegulationTable(zdev_t *dev, u16_t regionCode, u16_t c_lo, u16_t c_h
>  
>  	zmw_enter_critical_section(dev);
>  
> -	for (cm = modes; cm < &modes[N(modes)]; cm++) {
> +	for (cm = modes; cm < &modes[ARRAY_SIZE(modes)]; cm++) {
>  		u16_t c;
>  		u64_t *channelBM = NULL;
>  		REG_DOMAIN *rd = NULL;
> @@ -1846,7 +1843,7 @@ void zfHpGetRegulationTablefromCountry(zdev_t *dev, u16_t CountryCode)
>  
>  	zmw_declare_for_critical_section();
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (CountryCode == allCountries[i].countryCode) {
>  			RegDomain = allCountries[i].regDmnEnum;
>  
> @@ -1881,7 +1878,7 @@ u8_t zfHpGetRegulationTablefromISO(zdev_t *dev, u8_t *countryInfo, u8_t length)
>  		strLen = 3; */
>  	}
>  	/* zm_debug_msg_s("Desired iso name = ", isoName); */
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		/* zm_debug_msg_s("Current iso name = ", allCountries[i].isoName); */
>  		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, (u8_t *)&countryInfo[2], length-1)) {
>  			/* DbgPrint("Set current iso name = %s\n", allCountries[i].isoName); */
> @@ -1937,7 +1934,7 @@ const char *zfHpGetisoNamefromregionCode(zdev_t *dev, u16_t regionCode)
>  {
>  	u16_t i;
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (allCountries[i].regDmnEnum == regionCode)
>  			return allCountries[i].isoName;
>  	}
> @@ -1953,7 +1950,7 @@ u16_t zfHpGetRegionCodeFromIsoName(zdev_t *dev, u8_t *countryIsoName)
>  	/* if no matching item, return default */
>  	regionCode = DEF_REGDMN;
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, countryIsoName, 2)) {
>  			regionCode = allCountries[i].regDmnEnum;
>  		break;

Re: [PATCH 11/16] trivial: use ARRAY_SIZE

[walter harms]

walter harms schrieb:
> 
> Kulikov Vasiliy schrieb:
>> Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
>>
>> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
>> ---
>>  drivers/staging/otus/hal/hpreg.c |   17 +++++++----------
>>  1 files changed, 7 insertions(+), 10 deletions(-)
>>
>> diff --git a/drivers/staging/otus/hal/hpreg.c b/drivers/staging/otus/hal/hpreg.c
>> index da3b774..9b04653 100644
>> --- a/drivers/staging/otus/hal/hpreg.c
>> +++ b/drivers/staging/otus/hal/hpreg.c
>> @@ -29,9 +29,6 @@
>>  #include "hpreg.h"
>>  #include "hpusb.h"
>>  
>> -/* used throughout this file... */
>> -#define	N(a)	(sizeof(a) / sizeof(a[0]))
>> -
>>  #define HAL_MODE_11A_TURBO	HAL_MODE_108A
>>  #define HAL_MODE_11G_TURBO	HAL_MODE_108G
>>  
>> @@ -1557,7 +1554,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
>>  	u64_t flags = NO_REQ;
>>  	REG_DMN_PAIR_MAPPING *regPair = NULL;
>>  
>> -	for (i = 0, found = 0; (i < N(regDomainPairs)) && (!found); i++) {
>> +	for (i = 0, found = 0; (i < ARRAY_SIZE(regDomainPairs)) && (!found); i++) {
>>  		if (regDomainPairs[i].regDmnEnum == regionCode) {
>>  			regPair = &regDomainPairs[i];
>>  			found = 1;
> 
> 
> 
> This looks odd, i do not see the rest of the code but perhaps a break would help
> to eleminate the "found" ??
> 
> just my two cents,
>  wh
> 
1554 u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
1555 {
1556         s16_t i, found, regDmn;
1557         u64_t flags=NO_REQ;
1558         REG_DMN_PAIR_MAPPING *regPair=NULL;
1559
1560         for (i=0, found=0; (i<N(regDomainPairs))&&(!found); i++)
1561         {
1562                 if (regDomainPairs[i].regDmnEnum == regionCode)
1563                 {
1564                         regPair = &regDomainPairs[i];
1565                         found = 1;
1566                 }
1567         }
1568         if (!found)
1569         {
1570                 zm_debug_msg1("Failed to find reg domain pair ", regionCode);
1571                 return FALSE;
1572         }


This is would stop at the first hit and work without found.
Otherwise someone could add an {NULL} at the end of the array
und use a while () that would eliminate the need for ARRAY_SIZE also.

re,
 wh

for (i=0; i<ARRAY_SIZE(regDomainPairs);i++ )
	if (regDomainPairs[i].regDmnEnum == regionCode)
                    { regPair = &regDomainPairs[i]; break ; }

if (!regPair) {
        zm_debug_msg1("Failed to find reg domain pair ", regionCode);
        return FALSE;
}

Re: [PATCH 11/16] trivial: use ARRAY_SIZE

[Simon Horman]

On Mon, Jun 28, 2010 at 03:22:49PM +0200, walter harms wrote:
> 
> 
> walter harms schrieb:
> > 
> > Kulikov Vasiliy schrieb:
> >> Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
> >>
> >> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>
> >> ---
> >>  drivers/staging/otus/hal/hpreg.c |   17 +++++++----------
> >>  1 files changed, 7 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/drivers/staging/otus/hal/hpreg.c b/drivers/staging/otus/hal/hpreg.c
> >> index da3b774..9b04653 100644
> >> --- a/drivers/staging/otus/hal/hpreg.c
> >> +++ b/drivers/staging/otus/hal/hpreg.c
> >> @@ -29,9 +29,6 @@
> >>  #include "hpreg.h"
> >>  #include "hpusb.h"
> >>  
> >> -/* used throughout this file... */
> >> -#define	N(a)	(sizeof(a) / sizeof(a[0]))
> >> -
> >>  #define HAL_MODE_11A_TURBO	HAL_MODE_108A
> >>  #define HAL_MODE_11G_TURBO	HAL_MODE_108G
> >>  
> >> @@ -1557,7 +1554,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
> >>  	u64_t flags = NO_REQ;
> >>  	REG_DMN_PAIR_MAPPING *regPair = NULL;
> >>  
> >> -	for (i = 0, found = 0; (i < N(regDomainPairs)) && (!found); i++) {
> >> +	for (i = 0, found = 0; (i < ARRAY_SIZE(regDomainPairs)) && (!found); i++) {
> >>  		if (regDomainPairs[i].regDmnEnum == regionCode) {
> >>  			regPair = &regDomainPairs[i];
> >>  			found = 1;
> > 
> > 
> > 
> > This looks odd, i do not see the rest of the code but perhaps a break would help
> > to eleminate the "found" ??
> > 
> > just my two cents,
> >  wh
> > 
> 1554 u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
> 1555 {
> 1556         s16_t i, found, regDmn;
> 1557         u64_t flags=NO_REQ;
> 1558         REG_DMN_PAIR_MAPPING *regPair=NULL;
> 1559
> 1560         for (i=0, found=0; (i<N(regDomainPairs))&&(!found); i++)
> 1561         {
> 1562                 if (regDomainPairs[i].regDmnEnum == regionCode)
> 1563                 {
> 1564                         regPair = &regDomainPairs[i];
> 1565                         found = 1;
> 1566                 }
> 1567         }
> 1568         if (!found)
> 1569         {
> 1570                 zm_debug_msg1("Failed to find reg domain pair ", regionCode);
> 1571                 return FALSE;
> 1572         }
> 
> 
> This is would stop at the first hit and work without found.
> Otherwise someone could add an {NULL} at the end of the array
> und use a while () that would eliminate the need for ARRAY_SIZE also.

Either of those suggestions sounds fine to me, but it sounds
like it should be in a separate patch.

> 
> re,
>  wh
> 
> for (i=0; i<ARRAY_SIZE(regDomainPairs);i++ )
> 	if (regDomainPairs[i].regDmnEnum == regionCode)
>                     { regPair = &regDomainPairs[i]; break ; }
> 
> if (!regPair) {
>         zm_debug_msg1("Failed to find reg domain pair ", regionCode);
>         return FALSE;
> }
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH 11/16] trivial: use ARRAY_SIZE

[Simon Horman]

On Mon, Jun 28, 2010 at 03:55:24PM +0400, Kulikov Vasiliy wrote:
> Change sizeof(x) / sizeof(*x) to ARRAY_SIZE(x).
> 
> Signed-off-by: Kulikov Vasiliy <segooon@gmail.com>

Looks good.

Acked-by: Simon Horman <horms@verge.net.au>

> ---
>  drivers/staging/otus/hal/hpreg.c |   17 +++++++----------
>  1 files changed, 7 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/otus/hal/hpreg.c b/drivers/staging/otus/hal/hpreg.c
> index da3b774..9b04653 100644
> --- a/drivers/staging/otus/hal/hpreg.c
> +++ b/drivers/staging/otus/hal/hpreg.c
> @@ -29,9 +29,6 @@
>  #include "hpreg.h"
>  #include "hpusb.h"
>  
> -/* used throughout this file... */
> -#define	N(a)	(sizeof(a) / sizeof(a[0]))
> -
>  #define HAL_MODE_11A_TURBO	HAL_MODE_108A
>  #define HAL_MODE_11G_TURBO	HAL_MODE_108G
>  
> @@ -1557,7 +1554,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
>  	u64_t flags = NO_REQ;
>  	REG_DMN_PAIR_MAPPING *regPair = NULL;
>  
> -	for (i = 0, found = 0; (i < N(regDomainPairs)) && (!found); i++) {
> +	for (i = 0, found = 0; (i < ARRAY_SIZE(regDomainPairs)) && (!found); i++) {
>  		if (regDomainPairs[i].regDmnEnum == regionCode) {
>  			regPair = &regDomainPairs[i];
>  			found = 1;
> @@ -1581,7 +1578,7 @@ u8_t GetWmRD(u16_t regionCode, u16_t channelFlag, REG_DOMAIN *rd)
>  	 * unitary reg domain of the pair
>  	 */
>  
> -	for (i = 0 ; i < N(regDomains) ; i++) {
> +	for (i = 0 ; i < ARRAY_SIZE(regDomains) ; i++) {
>  		if (regDomains[i].regDmnEnum == regDmn) {
>  			if (rd != NULL) {
>  					zfMemoryCopy((u8_t *)rd, (u8_t *)&regDomains[i],
> @@ -1653,7 +1650,7 @@ void zfHpGetRegulationTable(zdev_t *dev, u16_t regionCode, u16_t c_lo, u16_t c_h
>  
>  	zmw_enter_critical_section(dev);
>  
> -	for (cm = modes; cm < &modes[N(modes)]; cm++) {
> +	for (cm = modes; cm < &modes[ARRAY_SIZE(modes)]; cm++) {
>  		u16_t c;
>  		u64_t *channelBM = NULL;
>  		REG_DOMAIN *rd = NULL;
> @@ -1846,7 +1843,7 @@ void zfHpGetRegulationTablefromCountry(zdev_t *dev, u16_t CountryCode)
>  
>  	zmw_declare_for_critical_section();
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (CountryCode == allCountries[i].countryCode) {
>  			RegDomain = allCountries[i].regDmnEnum;
>  
> @@ -1881,7 +1878,7 @@ u8_t zfHpGetRegulationTablefromISO(zdev_t *dev, u8_t *countryInfo, u8_t length)
>  		strLen = 3; */
>  	}
>  	/* zm_debug_msg_s("Desired iso name = ", isoName); */
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		/* zm_debug_msg_s("Current iso name = ", allCountries[i].isoName); */
>  		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, (u8_t *)&countryInfo[2], length-1)) {
>  			/* DbgPrint("Set current iso name = %s\n", allCountries[i].isoName); */
> @@ -1937,7 +1934,7 @@ const char *zfHpGetisoNamefromregionCode(zdev_t *dev, u16_t regionCode)
>  {
>  	u16_t i;
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (allCountries[i].regDmnEnum == regionCode)
>  			return allCountries[i].isoName;
>  	}
> @@ -1953,7 +1950,7 @@ u16_t zfHpGetRegionCodeFromIsoName(zdev_t *dev, u8_t *countryIsoName)
>  	/* if no matching item, return default */
>  	regionCode = DEF_REGDMN;
>  
> -	for (i = 0; i < N(allCountries); i++) {
> +	for (i = 0; i < ARRAY_SIZE(allCountries); i++) {
>  		if (zfMemoryIsEqual((u8_t *)allCountries[i].isoName, countryIsoName, 2)) {
>  			regionCode = allCountries[i].regDmnEnum;
>  		break;
> -- 
> 1.7.0.4
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/