Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

pci: minor cleanup of CONFIG_PCI_PNP usage

Browse source 
Refactor the common PCI code just a tiny bit surrounding the PCI_PNP
(pciauto) stuff.  Makes the code a tiny bit easier to read, and also
makes it more obvious that almost no platform needs to setup or use the
pci_config_table stuff.

Signed-off-by: Andrew Sharp <andywyse6@gmail.com>
This commit is contained in:
Andrew Sharp 2012-08-29 14:16:30 +00:00 committed by Wolfgang Denk
parent cb2bf931dc
commit 03992ac2c9
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/pci/pci.c
View file

@ -627,7 +627,9 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
unsigned int sub_bus, found_multi = 0; unsigned int sub_bus, found_multi = 0;
unsigned short vendor, device, class; unsigned short vendor, device, class;
unsigned char header_type; unsigned char header_type;
#ifndef CONFIG_PCI_PNP
struct pci_config_table *cfg; struct pci_config_table *cfg;
#endif
pci_dev_t dev; pci_dev_t dev;
#ifdef CONFIG_PCI_SCAN_SHOW #ifdef CONFIG_PCI_SCAN_SHOW
static int indent = 0; static int indent = 0;
@ -675,18 +677,16 @@ int pci_hose_scan_bus(struct pci_controller *hose, int bus)
} }
#endif #endif
#ifdef CONFIG_PCI_PNP
sub_bus = max(pciauto_config_device(hose, dev), sub_bus);
#else
cfg = pci_find_config(hose, class, vendor, device, cfg = pci_find_config(hose, class, vendor, device,
PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev)); PCI_BUS(dev), PCI_DEV(dev), PCI_FUNC(dev));
if (cfg) { if (cfg) {
cfg->config_device(hose, dev, cfg); cfg->config_device(hose, dev, cfg);
sub_bus = max(sub_bus, hose->current_busno); sub_bus = max(sub_bus, hose->current_busno);
#ifdef CONFIG_PCI_PNP
} else {
int n = pciauto_config_device(hose, dev);
sub_bus = max(sub_bus, n);
#endif
} }
#endif
#ifdef CONFIG_PCI_SCAN_SHOW #ifdef CONFIG_PCI_SCAN_SHOW
indent--; indent--;