From a94176627cdd6122ffadb618995f9bcec872609a Mon Sep 17 00:00:00 2001
From: Ian Romanick <idr@umwelt.(none)>
Date: Mon, 31 Jul 2006 14:33:58 -0700
Subject: [PATCH] Eliminate all uses of the businfo field of pciDevice /
 pciConfigPtr.

---
 hw/xfree86/os-support/bus/Pci.c     | 15 ---------------
 hw/xfree86/os-support/bus/xf86Pci.h |  1 -
 2 files changed, 16 deletions(-)

diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 31e58da48..456dd5ee3 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -425,11 +425,6 @@ xf86scanpci(int flags)
 	    if (i > devp->busnum) {
 		if (pciBusInfo[i]) {
 		    pciBusInfo[i]->bridge = devp;
-		    /*
-                     * The back link needs to be set here, and is unlikely to
-		     * change.
-		     */
-		    devp->businfo = pciBusInfo[i];
 		}
 #ifdef ARCH_PCI_PCI_BRIDGE
 		ARCH_PCI_PCI_BRIDGE(devp);
@@ -452,16 +447,6 @@ xf86scanpci(int flags)
     XF86SCANPCI_WRAPPER(SCANPCI_TERM);
 #endif
 
-    /*
-     * Lastly, link bridges to their secondary bus, after the architecture has
-     * had a chance to modify these assignments.
-     */
-    for (idx = 0;  idx < pciNumBuses;  idx++) {
-	if (!(busp = pciBusInfo[idx]) || !(devp = busp->bridge))
-	    continue;
-	devp->businfo = busp;
-    }
-
     xf86MsgVerb(X_INFO, 2, "PCI: End of PCI scan\n");
 
     return pci_devp;
diff --git a/hw/xfree86/os-support/bus/xf86Pci.h b/hw/xfree86/os-support/bus/xf86Pci.h
index f66c3822f..c690aa09c 100644
--- a/hw/xfree86/os-support/bus/xf86Pci.h
+++ b/hw/xfree86/os-support/bus/xf86Pci.h
@@ -656,7 +656,6 @@ typedef struct {
     int	      devnum;
     int	      funcnum;
     pciCfgSpc cfgspc;
-    pointer   businfo;		/* pointer to secondary's bus info structure */
     struct pci_device * dev;
 } pciDevice, *pciConfigPtr;