Now that we only probe host-PCI bridges once, we no longer have to check to

see if we have been probed before by checking for a pciX bus device.

3 files changed, 0 insertions, 32 deletions

diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c
index 56e8eb3..2e589dd 100644
--- a/sys/amd64/pci/pci_bus.c
+++ b/sys/amd64/pci/pci_bus.c
@@ -424,19 +424,9 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
 static int
 nexus_pcib_probe(device_t dev)
 {
-	devclass_t pci_devclass;
 
 	if (pci_cfgregopen() == 0)
 		return ENXIO;
-	/*
-	 * Check to see if we haven't already had a PCI bus added
-	 * via some other means.  If we have, bail since otherwise
-	 * we're going to end up duplicating it.
-	 */
-	if ((pci_devclass = devclass_find("pci")) && 
-		devclass_get_device(pci_devclass, device_get_unit(dev)))
-		return ENXIO;
-
 	return 0;
 }
 
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 39600a7..8e34f17 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -66,15 +66,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
 	return_VALUE(ENXIO);
 
     /*
-     * Make sure that this bus hasn't already been found.
-     */
-    if (devclass_get_device(devclass_find("pci"), busno) != NULL) {
-	device_printf(dev, "duplicate bus number %d - not probing bus\n",
-	    busno);
-	return_VALUE(0);
-    }
-
-    /*
      * Get the PCI interrupt routing table for this bus.
      */
     prt->Length = ACPI_ALLOCATE_BUFFER;
@@ -94,9 +85,6 @@ acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
 
     /*
      * Now go scan the bus.
-     *
-     * XXX It would be nice to defer this and count on the nexus getting it
-     * after the first pass, but this does not seem to be reliable.
      */
     return_VALUE(bus_generic_attach(dev));
 }
diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c
index 56e8eb3..2e589dd 100644
--- a/sys/i386/pci/pci_bus.c
+++ b/sys/i386/pci/pci_bus.c
@@ -424,19 +424,9 @@ nexus_pcib_identify(driver_t *driver, device_t parent)
 static int
 nexus_pcib_probe(device_t dev)
 {
-	devclass_t pci_devclass;
 
 	if (pci_cfgregopen() == 0)
 		return ENXIO;
-	/*
-	 * Check to see if we haven't already had a PCI bus added
-	 * via some other means.  If we have, bail since otherwise
-	 * we're going to end up duplicating it.
-	 */
-	if ((pci_devclass = devclass_find("pci")) && 
-		devclass_get_device(pci_devclass, device_get_unit(dev)))
-		return ENXIO;
-
 	return 0;
 }