diff options
| author |   Kumar Gala <galak@kernel.crashing.org> | 2007-06-22 00:29:46 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-06-29 01:57:29 -0500 |
| commit | 5229ee185287f4fd0d7809e6554b40ec83a4ba6c (patch) | |
| tree | d256a3ede9fad13c47bdb7f04e1c005b83186c5b /arch/powerpc/platforms/83xx/pci.c | |
| parent | [POWERPC] Pass the pci_controller into pci_exclude_device (diff) | |
| download | linux-dev-5229ee185287f4fd0d7809e6554b40ec83a4ba6c.tar.xz linux-dev-5229ee185287f4fd0d7809e6554b40ec83a4ba6c.zip | |
[POWERPC] Remove hack to determine the 2nd PHBs bus number
Now that we have the pci_controller in the exclude function we can easy
figure out if the bus number is the PHB or not. The old style of using a
variable setup at init time was actually broken and would only work in
specific cases.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/83xx/pci.c')
| -rw-r--r-- | arch/powerpc/platforms/83xx/pci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/83xx/pci.c b/arch/powerpc/platforms/83xx/pci.c index f92e71f2ed6b..8da935c6e269 100644 --- a/arch/powerpc/platforms/83xx/pci.c +++ b/arch/powerpc/platforms/83xx/pci.c @@ -33,15 +33,10 @@ #define DBG(x...) #endif -int mpc83xx_pci2_busno; - int mpc83xx_exclude_device(struct pci_controller *hose, u_char bus, u_char devfn) { - if (bus == 0 && PCI_SLOT(devfn) == 0) + if ((bus == hose->first_busno) && PCI_SLOT(devfn) == 0) return PCIBIOS_DEVICE_NOT_FOUND; - if (mpc83xx_pci2_busno) - if (bus == (mpc83xx_pci2_busno) && PCI_SLOT(devfn) == 0) - return PCIBIOS_DEVICE_NOT_FOUND; return PCIBIOS_SUCCESSFUL; } @@ -86,7 +81,6 @@ int __init mpc83xx_add_bridge(struct device_node *dev) setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384); primary = 0; hose->bus_offset = hose->first_busno; - mpc83xx_pci2_busno = hose->first_busno; } printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. " |