frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate all uses of the businfo field of pciDevice / pciConfigPtr.

This commit is contained in:
Ian Romanick 2006-07-31 14:33:58 -07:00
parent 26c9587f90
commit a94176627c
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hw/xfree86/os-support/bus/Pci.c
View File

@ -425,11 +425,6 @@ xf86scanpci(int flags)
if (i > devp->busnum) { if (i > devp->busnum) {
if (pciBusInfo[i]) { if (pciBusInfo[i]) {
pciBusInfo[i]->bridge = devp; 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 #ifdef ARCH_PCI_PCI_BRIDGE
ARCH_PCI_PCI_BRIDGE(devp); ARCH_PCI_PCI_BRIDGE(devp);
@ -452,16 +447,6 @@ xf86scanpci(int flags)
XF86SCANPCI_WRAPPER(SCANPCI_TERM); XF86SCANPCI_WRAPPER(SCANPCI_TERM);
#endif #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"); xf86MsgVerb(X_INFO, 2, "PCI: End of PCI scan\n");
return pci_devp; return pci_devp;

1
hw/xfree86/os-support/bus/xf86Pci.h
View File

@ -656,7 +656,6 @@ typedef struct {
int devnum; int devnum;
int funcnum; int funcnum;
pciCfgSpc cfgspc; pciCfgSpc cfgspc;
pointer businfo; /* pointer to secondary's bus info structure */
struct pci_device * dev; struct pci_device * dev;
} pciDevice, *pciConfigPtr; } pciDevice, *pciConfigPtr;