From 0f29bf015cacb988d59f71f88891fc22b785b06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20E=C3=9Fer?= <se@FreeBSD.org>
Date: Wed, 22 Mar 1995 21:35:39 +0000
Subject: [PATCH] Correct pcibus_setup() to return as soon as one test
 succeeds.

---
 sys/amd64/pci/pci_bus.c    | 4 +++-
 sys/amd64/pci/pci_cfgreg.c | 4 +++-
 sys/i386/isa/pcibus.c      | 4 +++-
 sys/i386/pci/pci_bus.c     | 4 +++-
 sys/i386/pci/pci_cfgreg.c  | 4 +++-
 sys/i386/pci/pci_pir.c     | 4 +++-
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------
diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------
diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/i386/isa/pcibus.c
+++ b/sys/i386/isa/pcibus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 0246a71f46ef..7fbb80f12cd1 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcibus.c,v 1.6 1995/03/22 10:52:05 se Exp $
+**  $Id: pcibus.c,v 1.7 1995/03/22 19:51:59 se Exp $
 **
 **  pci bus subroutines for i386 architecture.
 **
@@ -162,6 +162,7 @@ pcibus_setup (void)
 	if (!inb (CONF2_ENABLE_PORT) && !inb (CONF2_FORWARD_PORT)) {
 		pci_mechanism = 2;
 		pci_maxdevice = 16;
+		return;
 	};
 
 	/*---------------------------------------
@@ -177,6 +178,7 @@ pcibus_setup (void)
 	if (result == CONF1_ENABLE) {
 		pci_mechanism = 1;
 		pci_maxdevice = 32;
+		return;
 	};
 
 	/*---------------------------------------