svn commit: r236631 - in stable/9/sys: dev/iwn sys

[Marius Strobl]

Author: marius
Date: Tue Jun  5 19:58:58 2012
New Revision: 236631
URL: http://svn.freebsd.org/changeset/base/236631

Log:
  MFC: r236486
  
  Add nitems(), a macro for determining the number of elements in a
  statically-allocated array.
  
  Obtained from:	OpenBSD (in principle)
  
  MFC: r236489

Modified:
  stable/9/sys/dev/iwn/if_iwn.c
  stable/9/sys/sys/param.h
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/dev/   (props changed)
  stable/9/sys/dev/e1000/   (props changed)
  stable/9/sys/dev/ixgbe/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/modules/   (props changed)

Modified: stable/9/sys/dev/iwn/if_iwn.c
==============================================================================
--- stable/9/sys/dev/iwn/if_iwn.c	Tue Jun  5 19:51:37 2012	(r236630)
+++ stable/9/sys/dev/iwn/if_iwn.c	Tue Jun  5 19:58:58 2012	(r236631)
@@ -2005,8 +2005,6 @@ iwn_setregdomain(struct ieee80211com *ic
 	return 0;
 }
 
-#define nitems(_a)	(sizeof((_a)) / sizeof((_a)[0]))
-
 static void
 iwn_read_eeprom_enhinfo(struct iwn_softc *sc)
 {

Modified: stable/9/sys/sys/param.h
==============================================================================
--- stable/9/sys/sys/param.h	Tue Jun  5 19:51:37 2012	(r236630)
+++ stable/9/sys/sys/param.h	Tue Jun  5 19:58:58 2012	(r236631)
@@ -273,6 +273,7 @@
 #ifndef howmany
 #define	howmany(x, y)	(((x)+((y)-1))/(y))
 #endif
+#define	nitems(x)	(sizeof((x)) / sizeof((x)[0]))
 #define	rounddown(x, y)	(((x)/(y))*(y))
 #define	roundup(x, y)	((((x)+((y)-1))/(y))*(y))  /* to any y */
 #define	roundup2(x, y)	(((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */