Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa

[linux-2.6-omap-h63xx.git] / arch / frv / mb93090-mb00 / pci-irq.c

diff --git a/arch/frv/mb93090-mb00/pci-irq.c b/arch/frv/mb93090-mb00/pci-irq.c
index af981bda015cb719db418a71410236c45871f42d..45ae39d84b69a7da6d82d2c0828c64f54859498d 100644 (file)
--- a/arch/frv/mb93090-mb00/pci-irq.c
+++ b/arch/frv/mb93090-mb00/pci-irq.c
@@ -32,11 +32,11 @@
  */
 
 static const uint8_t __initdata pci_bus0_irq_routing[32][4] = {
-       [0 ] {  IRQ_FPGA_MB86943_PCI_INTA },
-       [16] {  IRQ_FPGA_RTL8029_INTA },
-       [17] {  IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },
-       [18] {  IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },
-       [19] {  IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },
+       [0 ] = { IRQ_FPGA_MB86943_PCI_INTA },
+       [16] = { IRQ_FPGA_RTL8029_INTA },
+       [17] = { IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB },
+       [18] = { IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD, IRQ_FPGA_PCI_INTA },
+       [19] = { IRQ_FPGA_PCI_INTA, IRQ_FPGA_PCI_INTB, IRQ_FPGA_PCI_INTC, IRQ_FPGA_PCI_INTD },
 };
 
 void __init pcibios_irq_init(void)
@@ -48,9 +48,7 @@ void __init pcibios_fixup_irqs(void)
        struct pci_dev *dev = NULL;
        uint8_t line, pin;
 
-       while (dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev),
-              dev != NULL
-              ) {
+       for_each_pci_dev(dev) {
                pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
                if (pin) {
                        dev->irq = pci_bus0_irq_routing[PCI_SLOT(dev->devfn)][pin - 1];
@@ -60,7 +58,7 @@ void __init pcibios_fixup_irqs(void)
        }
 }
 
-void __init pcibios_penalize_isa_irq(int irq, int active)
+void __init pcibios_penalize_isa_irq(int irq)
 {
 }