Commit 8d09b87b authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Richard Henderson

[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.
parent 010abedb
...@@ -285,7 +285,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp) ...@@ -285,7 +285,7 @@ common_swizzle(struct pci_dev *dev, u8 *pinp)
pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn)); pin = bridge_swizzle(pin, PCI_SLOT(dev->devfn));
/* Move up the chain of bridges. */ /* Move up the chain of bridges. */
dev = dev->bus->self; dev = dev->bus->self;
} while (dev->bus->self); } while (dev->bus->parent);
*pinp = pin; *pinp = pin;
/* The slot is the slot of the last bridge. */ /* The slot is the slot of the last bridge. */
...@@ -410,9 +410,7 @@ common_init_pci(void) ...@@ -410,9 +410,7 @@ common_init_pci(void)
if (pci_probe_only) if (pci_probe_only)
pcibios_claim_console_setup(); 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); pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment