From 8d09b87b701d7d5695c209413a94ce77a102f859 Mon Sep 17 00:00:00 2001 From: Ivan Kokshaysky Date: Mon, 24 Mar 2003 06:24:28 -0800 Subject: [PATCH] [PATCH] alpha: pci update - Check for parent PCI bus instead of bridge device to break the look in common_swizzle(). Functionally it's the same, but it's cleaner for PC-style host bridges (nautiluses). - Generic PCI setup changes finally went in (thanks to rmk), so that FIXME in common_init_pci() can go. Ivan. --- arch/alpha/kernel/pci.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c index b52bc37198039..eb793034735ee 100644 --- a/arch/alpha/kernel/pci.c +++ b/arch/alpha/kernel/pci.c @@ -285,7 +285,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp) pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)); /* Move up the chain of bridges. */ dev = dev->bus->self; - } while (dev->bus->self); + } while (dev->bus->parent); *pinp = pin; /* The slot is the slot of the last bridge. */ @@ -410,10 +410,8 @@ common_init_pci(void) if (pci_probe_only) pcibios_claim_console_setup(); - else /* FIXME: `else' will be removed when - pci_assign_unassigned_resources() is able to work - correctly with [partially] allocated PCI tree. */ - pci_assign_unassigned_resources(); + + pci_assign_unassigned_resources(); pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq); } -- 2.53.0