From cb8e4332325147c7f8a91eff105233528c70b20a Mon Sep 17 00:00:00 2001
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Sat, 28 Sep 2002 17:36:29 +0000
Subject: [PATCH] Don't call function in return() for a void function.

---
 sys/amd64/pci/pci_cfgreg.c | 8 +++++---
 sys/i386/pci/pci_cfgreg.c  | 8 +++++---
 sys/i386/pci/pci_pir.c     | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c
index 536c5a6cf20..86a867b92c0 100644
--- a/sys/amd64/pci/pci_cfgreg.c
+++ b/sys/amd64/pci/pci_cfgreg.c
@@ -266,9 +266,11 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
 void
 pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
 {
-    return (usebios ? 
-	pcibios_cfgwrite(bus, slot, func, reg, data, bytes) : 
-	pcireg_cfgwrite(bus, slot, func, reg, data, bytes));
+
+	if (usebios)
+		pcibios_cfgwrite(bus, slot, func, reg, data, bytes);
+	else
+		pcireg_cfgwrite(bus, slot, func, reg, data, bytes);
 }
 
 /*
diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c
index 536c5a6cf20..86a867b92c0 100644
--- a/sys/i386/pci/pci_cfgreg.c
+++ b/sys/i386/pci/pci_cfgreg.c
@@ -266,9 +266,11 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
 void
 pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
 {
-    return (usebios ? 
-	pcibios_cfgwrite(bus, slot, func, reg, data, bytes) : 
-	pcireg_cfgwrite(bus, slot, func, reg, data, bytes));
+
+	if (usebios)
+		pcibios_cfgwrite(bus, slot, func, reg, data, bytes);
+	else
+		pcireg_cfgwrite(bus, slot, func, reg, data, bytes);
 }
 
 /*
diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c
index 536c5a6cf20..86a867b92c0 100644
--- a/sys/i386/pci/pci_pir.c
+++ b/sys/i386/pci/pci_pir.c
@@ -266,9 +266,11 @@ pci_cfgregread(int bus, int slot, int func, int reg, int bytes)
 void
 pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes)
 {
-    return (usebios ? 
-	pcibios_cfgwrite(bus, slot, func, reg, data, bytes) : 
-	pcireg_cfgwrite(bus, slot, func, reg, data, bytes));
+
+	if (usebios)
+		pcibios_cfgwrite(bus, slot, func, reg, data, bytes);
+	else
+		pcireg_cfgwrite(bus, slot, func, reg, data, bytes);
 }
 
 /*