From owner-svn-src-stable@freebsd.org  Fri Sep 30 00:43:31 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 8F03CC00A69;
 Fri, 30 Sep 2016 00:43:31 +0000 (UTC) (envelope-from jhb@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 61C5AAF6;
 Fri, 30 Sep 2016 00:43:31 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8U0hU7t069158;
 Fri, 30 Sep 2016 00:43:30 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8U0hUwB069157;
 Fri, 30 Sep 2016 00:43:30 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201609300043.u8U0hUwB069157@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 30 Sep 2016 00:43:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r306468 - stable/10/sys/dev/pci
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2016 00:43:31 -0000

Author: jhb
Date: Fri Sep 30 00:43:30 2016
New Revision: 306468
URL: https://svnweb.freebsd.org/changeset/base/306468

Log:
  MFC 295813,295816: Remove redundant check for "(dinfo != NULL)".

Modified:
  stable/10/sys/dev/pci/pci_user.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/pci/pci_user.c
==============================================================================
--- stable/10/sys/dev/pci/pci_user.c	Fri Sep 30 00:33:19 2016	(r306467)
+++ stable/10/sys/dev/pci/pci_user.c	Fri Sep 30 00:43:30 2016	(r306468)
@@ -709,9 +709,9 @@ pci_ioctl(struct cdev *dev, u_long cmd, 
 		 * that match the user's criteria.
 		 */
 		for (cio->num_matches = 0, error = 0, i = 0,
-		     dinfo = STAILQ_FIRST(devlist_head);
-		     (dinfo != NULL) && (cio->num_matches < ionum)
-		     && (error == 0) && (i < pci_numdevs) && (dinfo != NULL);
+				 dinfo = STAILQ_FIRST(devlist_head);
+		     (dinfo != NULL) && (cio->num_matches < ionum) &&
+				 (error == 0) && (i < pci_numdevs);
 		     dinfo = STAILQ_NEXT(dinfo, pci_links), i++) {
 
 			if (i < cio->offset)