- use nitems() where applicable

ok grange@

4 files changed, 8 insertions, 12 deletions

diff --git a/sys/dev/onewire/owctr.c b/sys/dev/onewire/owctr.c
index 3d57cffa022..5f0beb963c7 100644
--- a/sys/dev/onewire/owctr.c
+++ b/sys/dev/onewire/owctr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owctr.c,v 1.2 2010/07/07 16:15:53 deraadt Exp $	*/
+/*	$OpenBSD: owctr.c,v 1.3 2010/07/08 07:19:54 jasper Exp $	*/
 /*
  * Copyright (c) 2010 John L. Scarfone <john@scarfone.net>
  *
@@ -84,8 +84,7 @@ static const struct onewire_matchfam owctr_fams[] = {
 int
 owctr_match(struct device *parent, void *match, void *aux)
 {
-	return (onewire_matchbyfam(aux, owctr_fams,
-		sizeof(owctr_fams) /sizeof(owctr_fams[0])));
+	return (onewire_matchbyfam(aux, owctr_fams, nitems(owctr_fams)));
 }
 
 void
diff --git a/sys/dev/onewire/owid.c b/sys/dev/onewire/owid.c
index 3a0e23d8dd1..861f1228528 100644
--- a/sys/dev/onewire/owid.c
+++ b/sys/dev/onewire/owid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owid.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $	*/
+/*	$OpenBSD: owid.c,v 1.8 2010/07/08 07:19:54 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -67,8 +67,7 @@ static const struct onewire_matchfam owid_fams[] = {
 int
 owid_match(struct device *parent, void *match, void *aux)
 {
-	return (onewire_matchbyfam(aux, owid_fams,
-	    sizeof(owid_fams) /sizeof(owid_fams[0])));
+	return (onewire_matchbyfam(aux, owid_fams, nitems(owid_fams)));
 }
 
 void
diff --git a/sys/dev/onewire/owsbm.c b/sys/dev/onewire/owsbm.c
index b7821da74bf..10d6d2835d1 100644
--- a/sys/dev/onewire/owsbm.c
+++ b/sys/dev/onewire/owsbm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owsbm.c,v 1.7 2009/10/13 19:33:16 pirofti Exp $	*/
+/*	$OpenBSD: owsbm.c,v 1.8 2010/07/08 07:19:54 jasper Exp $	*/
 
 /*
  * Copyright (c) 2007 Aaron Linville <aaron@linville.org>
@@ -100,8 +100,7 @@ static const struct onewire_matchfam owsbm_fams[] = {
 int
 owsbm_match(struct device *parent, void *match, void *aux)
 {
-	return (onewire_matchbyfam(aux, owsbm_fams,
-	    sizeof(owsbm_fams) /sizeof(owsbm_fams[0])));
+	return (onewire_matchbyfam(aux, owsbm_fams, nitems(owsbm_fams)));
 }
 
 void
diff --git a/sys/dev/onewire/owtemp.c b/sys/dev/onewire/owtemp.c
index 6b7786f9a8e..eb7ccee708c 100644
--- a/sys/dev/onewire/owtemp.c
+++ b/sys/dev/onewire/owtemp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: owtemp.c,v 1.14 2009/10/13 19:33:16 pirofti Exp $	*/
+/*	$OpenBSD: owtemp.c,v 1.15 2010/07/08 07:19:54 jasper Exp $	*/
 
 /*
  * Copyright (c) 2006, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -86,8 +86,7 @@ static const struct onewire_matchfam owtemp_fams[] = {
 int
 owtemp_match(struct device *parent, void *match, void *aux)
 {
-	return (onewire_matchbyfam(aux, owtemp_fams,
-	    sizeof(owtemp_fams) /sizeof(owtemp_fams[0])));
+	return (onewire_matchbyfam(aux, owtemp_fams, nitems(owtemp_fams)));
 }
 
 void