svn commit: r306468 - stable/10/sys/dev/pci

[John Baldwin]

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)