CVS commit: src/sys/dev/pci

[Christoph Egger]

Module Name:    src
Committed By:   cegger
Date:           Fri Jun 12 08:33:41 UTC 2009

Modified Files:
        src/sys/dev/pci: esm.c

Log Message:
use __arraycount(). Same object code generated.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/pci/esm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/esm.c
diff -u src/sys/dev/pci/esm.c:1.49 src/sys/dev/pci/esm.c:1.50
--- src/sys/dev/pci/esm.c:1.49	Thu May  7 06:08:02 2009
+++ src/sys/dev/pci/esm.c	Fri Jun 12 08:33:41 2009
@@ -1,4 +1,4 @@
-/*      $NetBSD: esm.c,v 1.49 2009/05/07 06:08:02 cegger Exp $      */
+/*      $NetBSD: esm.c,v 1.50 2009/06/12 08:33:41 cegger Exp $      */
 
 /*-
  * Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.49 2009/05/07 06:08:02 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.50 2009/06/12 08:33:41 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -249,7 +249,7 @@
 {
 	int i;
 
-	for (i = 0; i < (sizeof esm_quirks / sizeof esm_quirks[0]); i++) {
+	for (i = 0; i < __arraycount(esm_quirks); i++) {
 		if (PCI_VENDOR(subid) == esm_quirks[i].eq_vendor &&
 		    PCI_PRODUCT(subid) == esm_quirks[i].eq_product) {
 			return esm_quirks[i].eq_quirks;
@@ -288,7 +288,7 @@
 	int i;
 
 	printf("%s registers:", device_xname(ess->sc_dev));
-	for (i = 0; i < (sizeof dump_regs / sizeof dump_regs[0]); i++) {
+	for (i = 0; i < __arraycount(dump_regs); i++) {
 		if (i % 5 == 0)
 			printf("\n");
 		printf("0x%2.2x: ", dump_regs[i].offset);
@@ -1528,7 +1528,7 @@
 
 	p->size = size;
 	error = bus_dmamem_alloc(sc->dmat, p->size, align, 0,
-				 p->segs, sizeof(p->segs)/sizeof(p->segs[0]),
+				 p->segs, __arraycount(p->segs),
 				 &p->nsegs, BUS_DMA_NOWAIT);
 	if (error)
 		return error;