From owner-svn-src-head@freebsd.org  Thu Apr 21 15:24:22 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id B4E29B15AE6;
 Thu, 21 Apr 2016 15:24:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 875CD17DB;
 Thu, 21 Apr 2016 15:24:22 +0000 (UTC) (envelope-from pfg@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3LFOLra023095;
 Thu, 21 Apr 2016 15:24:21 GMT (envelope-from pfg@FreeBSD.org)
Received: (from pfg@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3LFOLMX023094;
 Thu, 21 Apr 2016 15:24:21 GMT (envelope-from pfg@FreeBSD.org)
Message-Id: <201604211524.u3LFOLMX023094@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pfg set sender to pfg@FreeBSD.org
 using -f
From: "Pedro F. Giffuni" <pfg@FreeBSD.org>
Date: Thu, 21 Apr 2016 15:24:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r298409 - head/sys/dev/siba
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Apr 2016 15:24:22 -0000

Author: pfg
Date: Thu Apr 21 15:24:21 2016
New Revision: 298409
URL: https://svnweb.freebsd.org/changeset/base/298409

Log:
  siba(4): remove slightly used 'bound' variable.
  
  It can be replaced with nitems(). While here simplify the function
  
  Suggested by:	jhb

Modified:
  head/sys/dev/siba/siba.c

Modified: head/sys/dev/siba/siba.c
==============================================================================
--- head/sys/dev/siba/siba.c	Thu Apr 21 15:06:53 2016	(r298408)
+++ head/sys/dev/siba/siba.c	Thu Apr 21 15:24:21 2016	(r298409)
@@ -337,22 +337,19 @@ siba_attach(device_t dev)
 static struct siba_devid *
 siba_dev_match(uint16_t vid, uint16_t devid, uint8_t rev)
 {
-	size_t			 i, bound;
+	size_t			 i;
 	struct siba_devid	*sd;
 
-	bound = sizeof(siba_devids) / sizeof(struct siba_devid);
 	sd = &siba_devids[0];
-	for (i = 0; i < bound; i++, sd++) {
+	for (i = 0; i < nitems(siba_devids); i++, sd++) {
 		if (((vid == SIBA_VID_ANY) || (vid == sd->sd_vendor)) &&
 		    ((devid == SIBA_DEVID_ANY) || (devid == sd->sd_device)) &&
 		    ((rev == SIBA_REV_ANY) || (rev == sd->sd_rev) ||
 		     (sd->sd_rev == SIBA_REV_ANY)))
-			break;
+			return(sd);
 	}
-	if (i == bound)
-		sd = NULL;
 
-	return (sd);
+	return (NULL);
 }
 
 static int