Don't re-look-up pointers that are already stored in structures.
This commit is contained in:
		
							parent
							
								
									2fd6b995ff
								
							
						
					
					
						commit
						82f6b7e75e
					
				| 
						 | 
					@ -644,10 +644,7 @@ xf86GetPciBridgeInfo(void)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* Add each bridge */
 | 
					    /* Add each bridge */
 | 
				
			||||||
    for (pcrpp = xf86PciInfo, pcrp = *pcrpp; pcrp; pcrp = *(++pcrpp)) {
 | 
					    for (pcrpp = xf86PciInfo, pcrp = *pcrpp; pcrp; pcrp = *(++pcrpp)) {
 | 
				
			||||||
	struct pci_device * const dev = 
 | 
						struct pci_device * const dev = pcrp->dev;
 | 
				
			||||||
	  pci_device_find_by_slot( PCI_DOM_FROM_BUS( pcrp->busnum ),
 | 
					 | 
				
			||||||
				   PCI_BUS_NO_DOMAIN( pcrp->busnum ),
 | 
					 | 
				
			||||||
				   pcrp->devnum, pcrp->funcnum );
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (pcrp->busnum > MaxBus)
 | 
						if (pcrp->busnum > MaxBus)
 | 
				
			||||||
	    MaxBus = pcrp->busnum;
 | 
						    MaxBus = pcrp->busnum;
 | 
				
			||||||
| 
						 | 
					@ -1103,10 +1100,7 @@ xf86GetPciBridgeInfo(void)
 | 
				
			||||||
		*pnPciBus = PciBus = xnfcalloc(1, sizeof(PciBusRec));
 | 
							*pnPciBus = PciBus = xnfcalloc(1, sizeof(PciBusRec));
 | 
				
			||||||
		pnPciBus = &PciBus->next;
 | 
							pnPciBus = &PciBus->next;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		PciBus->dev = pci_device_find_by_slot( PCI_DOM_FROM_BUS( pcrp->busnum ),
 | 
							PciBus->dev = pcrp->dev;
 | 
				
			||||||
						       PCI_BUS_NO_DOMAIN( pcrp->busnum ),
 | 
					 | 
				
			||||||
						       pcrp->devnum,
 | 
					 | 
				
			||||||
						       pcrp->funcnum );
 | 
					 | 
				
			||||||
		PciBus->primary = PciBus->secondary = i;
 | 
							PciBus->primary = PciBus->secondary = i;
 | 
				
			||||||
		PciBus->subclass = PCI_SUBCLASS_BRIDGE_HOST;
 | 
							PciBus->subclass = PCI_SUBCLASS_BRIDGE_HOST;
 | 
				
			||||||
		PciBus->brcontrol = PCI_PCI_BRIDGE_VGA_EN;
 | 
							PciBus->brcontrol = PCI_PCI_BRIDGE_VGA_EN;
 | 
				
			||||||
| 
						 | 
					@ -1305,10 +1299,7 @@ initPciBusState(void)
 | 
				
			||||||
	    pbap->set_f = pciSetBusAccess;
 | 
						    pbap->set_f = pciSetBusAccess;
 | 
				
			||||||
	    pbap->enable_f = pciBusAccessEnable;
 | 
						    pbap->enable_f = pciBusAccessEnable;
 | 
				
			||||||
	    pbap->disable_f = pciBusAccessDisable;
 | 
						    pbap->disable_f = pciBusAccessDisable;
 | 
				
			||||||
	    pbap->busdep.pci.dev = pci_device_find_by_slot(PCI_DOM_FROM_BUS(pbp->brbus),
 | 
						    pbap->busdep.pci.dev = pbp->dev;
 | 
				
			||||||
							   PCI_BUS_NO_DOMAIN(pbp->brbus),
 | 
					 | 
				
			||||||
							   pbp->brdev,
 | 
					 | 
				
			||||||
							   pbp->brfunc);
 | 
					 | 
				
			||||||
	    savePciBusState(pbap);
 | 
						    savePciBusState(pbap);
 | 
				
			||||||
	    break;
 | 
						    break;
 | 
				
			||||||
	case PCI_SUBCLASS_BRIDGE_ISA:
 | 
						case PCI_SUBCLASS_BRIDGE_ISA:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue