x86: Add pci_init_irq to x86_init

[safe/jmp/linux-2.6] / arch / x86 / pci / irq.c

diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
index 0696d50..0f40ff2 100644 (file)
--- a/arch/x86/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@ -53,7 +53,7 @@ struct irq_router_handler {
        int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
 };
 
-int (*pcibios_enable_irq)(struct pci_dev *dev) = NULL;
+int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
 void (*pcibios_disable_irq)(struct pci_dev *dev) = NULL;
 
 /*
@@ -1110,12 +1110,12 @@ static struct dmi_system_id __initdata pciirq_dmi_table[] = {
        { }
 };
 
-int __init pcibios_irq_init(void)
+void __init pcibios_irq_init(void)
 {
        DBG(KERN_DEBUG "PCI: IRQ init\n");
 
-       if (pcibios_enable_irq || raw_pci_ops == NULL)
-               return 0;
+       if (raw_pci_ops == NULL)
+               return;
 
        dmi_check_system(pciirq_dmi_table);
 
@@ -1142,8 +1142,6 @@ int __init pcibios_irq_init(void)
                        pirq_table = NULL;
        }
 
-       pcibios_enable_irq = pirq_enable_irq;
-
        pcibios_fixup_irqs();
 
        if (io_apic_assign_pci_irqs && pci_routeirq) {
@@ -1157,8 +1155,6 @@ int __init pcibios_irq_init(void)
                for_each_pci_dev(dev)
                        pirq_enable_irq(dev);
        }
-
-       return 0;
 }
 
 static void pirq_penalize_isa_irq(int irq, int active)