- use nitems(); no binary change@

ok jsg@

6 files changed, 12 insertions, 18 deletions

diff --git a/sys/dev/cardbus/if_atw_cardbus.c b/sys/dev/cardbus/if_atw_cardbus.c
index dc145ec762e..ef864e3c0b6 100644
--- a/sys/dev/cardbus/if_atw_cardbus.c
+++ b/sys/dev/cardbus/if_atw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_atw_cardbus.c,v 1.19 2010/09/06 19:20:21 deraadt Exp $	*/
+/*	$OpenBSD: if_atw_cardbus.c,v 1.20 2011/04/02 17:47:04 jasper Exp $	*/
 /*	$NetBSD: if_atw_cardbus.c,v 1.9 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -129,8 +129,7 @@ int
 atw_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    atw_cardbus_devices,
-	    sizeof(atw_cardbus_devices)/sizeof(atw_cardbus_devices[0])));
+	    atw_cardbus_devices, nitems(atw_cardbus_devices)));
 }
 
 void
diff --git a/sys/dev/cardbus/if_dc_cardbus.c b/sys/dev/cardbus/if_dc_cardbus.c
index 4a2e20216f6..cfae7fa3c68 100644
--- a/sys/dev/cardbus/if_dc_cardbus.c
+++ b/sys/dev/cardbus/if_dc_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_dc_cardbus.c,v 1.34 2010/08/31 17:01:15 deraadt Exp $	*/
+/*	$OpenBSD: if_dc_cardbus.c,v 1.35 2011/04/02 17:47:04 jasper Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -115,8 +115,7 @@ int
 dc_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    dc_cardbus_devices,
-	    sizeof(dc_cardbus_devices)/sizeof(dc_cardbus_devices[0])));
+	    dc_cardbus_devices, nitems(dc_cardbus_devices)));
 }
 
 void
diff --git a/sys/dev/cardbus/if_fxp_cardbus.c b/sys/dev/cardbus/if_fxp_cardbus.c
index da4aad49462..e1cbc83fded 100644
--- a/sys/dev/cardbus/if_fxp_cardbus.c
+++ b/sys/dev/cardbus/if_fxp_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_fxp_cardbus.c,v 1.28 2010/08/27 18:25:46 deraadt Exp $ */
+/*	$OpenBSD: if_fxp_cardbus.c,v 1.29 2011/04/02 17:47:04 jasper Exp $ */
 /*	$NetBSD: if_fxp_cardbus.c,v 1.12 2000/05/08 18:23:36 thorpej Exp $	*/
 
 /*
@@ -115,8 +115,7 @@ int
 fxp_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    fxp_cardbus_devices,
-	    sizeof(fxp_cardbus_devices)/sizeof(fxp_cardbus_devices[0])));
+	    fxp_cardbus_devices, nitems(fxp_cardbus_devices)));
 }
 
 void
diff --git a/sys/dev/cardbus/if_re_cardbus.c b/sys/dev/cardbus/if_re_cardbus.c
index 1b4492c7663..c551a89b689 100644
--- a/sys/dev/cardbus/if_re_cardbus.c
+++ b/sys/dev/cardbus/if_re_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_re_cardbus.c,v 1.21 2010/09/07 16:21:41 deraadt Exp $	*/
+/*	$OpenBSD: if_re_cardbus.c,v 1.22 2011/04/02 17:47:04 jasper Exp $	*/
 
 /*
  * Copyright (c) 2005 Peter Valchev <pvalchev@openbsd.org>
@@ -98,8 +98,7 @@ int
 re_cardbus_probe(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    re_cardbus_devices,
-	    sizeof(re_cardbus_devices)/sizeof(re_cardbus_devices[0])));
+	    re_cardbus_devices, nitems(re_cardbus_devices)));
 }
 
 /*
diff --git a/sys/dev/cardbus/if_rl_cardbus.c b/sys/dev/cardbus/if_rl_cardbus.c
index 9bb31998ec1..38012b8d79b 100644
--- a/sys/dev/cardbus/if_rl_cardbus.c
+++ b/sys/dev/cardbus/if_rl_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rl_cardbus.c,v 1.21 2010/03/27 21:40:13 jsg Exp $ */
+/*	$OpenBSD: if_rl_cardbus.c,v 1.22 2011/04/02 17:47:04 jasper Exp $ */
 /*	$NetBSD: if_rl_cardbus.c,v 1.3.8.3 2001/11/14 19:14:02 nathanw Exp $	*/
 
 /*
@@ -136,8 +136,7 @@ int
 rl_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    rl_cardbus_devices,
-	    sizeof(rl_cardbus_devices)/sizeof(rl_cardbus_devices[0])));
+	    rl_cardbus_devices, nitems(rl_cardbus_devices)));
 }
 
 
diff --git a/sys/dev/cardbus/if_rtw_cardbus.c b/sys/dev/cardbus/if_rtw_cardbus.c
index be7525eca81..77a46a094b3 100644
--- a/sys/dev/cardbus/if_rtw_cardbus.c
+++ b/sys/dev/cardbus/if_rtw_cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rtw_cardbus.c,v 1.19 2010/09/06 19:20:21 deraadt Exp $	*/
+/*	$OpenBSD: if_rtw_cardbus.c,v 1.20 2011/04/02 17:47:04 jasper Exp $	*/
 /* $NetBSD: if_rtw_cardbus.c,v 1.4 2004/12/20 21:05:34 dyoung Exp $ */
 
 /*-
@@ -168,8 +168,7 @@ int
 rtw_cardbus_match(struct device *parent, void *match, void *aux)
 {
 	return (cardbus_matchbyid((struct cardbus_attach_args *)aux,
-	    rtw_cardbus_devices,
-	    sizeof(rtw_cardbus_devices)/sizeof(rtw_cardbus_devices[0])));
+	    rtw_cardbus_devices, nitems(rtw_cardbus_devices)));
 }
 
 void