From owner-svn-src-head@FreeBSD.ORG  Sat Jun  2 19:41:29 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 14838106564A;
	Sat,  2 Jun 2012 19:41:29 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F37E18FC0C;
	Sat,  2 Jun 2012 19:41:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q52JfSMm010091;
	Sat, 2 Jun 2012 19:41:28 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q52JfSR4010088;
	Sat, 2 Jun 2012 19:41:28 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201206021941.q52JfSR4010088@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 2 Jun 2012 19:41:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r236488 - in head/sys/dev: bge sym
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Jun 2012 19:41:29 -0000

Author: marius
Date: Sat Jun  2 19:41:28 2012
New Revision: 236488
URL: http://svn.freebsd.org/changeset/base/236488

Log:
  Take advantage of nitems().
  
  MFC after:	3 days

Modified:
  head/sys/dev/bge/if_bge.c
  head/sys/dev/sym/sym_hipd.c

Modified: head/sys/dev/bge/if_bge.c
==============================================================================
--- head/sys/dev/bge/if_bge.c	Sat Jun  2 19:39:12 2012	(r236487)
+++ head/sys/dev/bge/if_bge.c	Sat Jun  2 19:41:28 2012	(r236488)
@@ -2766,9 +2766,8 @@ bge_mbox_reorder(struct bge_softc *sc)
 	};
 	devclass_t pci, pcib;
 	device_t bus, dev;
-	int count, i;
+	int i;
 
-	count = sizeof(mbox_reorder_lists) / sizeof(mbox_reorder_lists[0]);
 	pci = devclass_find("pci");
 	pcib = devclass_find("pcib");
 	dev = sc->bge_dev;
@@ -2778,7 +2777,7 @@ bge_mbox_reorder(struct bge_softc *sc)
 		bus = device_get_parent(dev);
 		if (device_get_devclass(dev) != pcib)
 			break;
-		for (i = 0; i < count; i++) {
+		for (i = 0; i < nitems(mbox_reorder_lists); i++) {
 			if (pci_get_vendor(dev) ==
 			    mbox_reorder_lists[i].vendor &&
 			    pci_get_device(dev) ==

Modified: head/sys/dev/sym/sym_hipd.c
==============================================================================
--- head/sys/dev/sym/sym_hipd.c	Sat Jun  2 19:39:12 2012	(r236487)
+++ head/sys/dev/sym/sym_hipd.c	Sat Jun  2 19:41:28 2012	(r236488)
@@ -8411,9 +8411,6 @@ static const struct sym_pci_chip sym_pci
  FE_RAM|FE_IO256|FE_LEDC}
 };
 
-#define sym_pci_num_devs \
-	(sizeof(sym_pci_dev_table) / sizeof(sym_pci_dev_table[0]))
-
 /*
  *  Look up the chip table.
  *
@@ -8434,7 +8431,7 @@ sym_find_pci_chip(device_t dev)
 	device_id = pci_get_device(dev);
 	revision  = pci_get_revid(dev);
 
-	for (i = 0; i < sym_pci_num_devs; i++) {
+	for (i = 0; i < nitems(sym_pci_dev_table); i++) {
 		chip = &sym_pci_dev_table[i];
 		if (device_id != chip->device_id)
 			continue;