From: Bjorn Helgaas Tone down the message about using "pci=routeirq". I do still get a few reports, but most are now prompted just by the fact that my email address appears in dmesg in an "error-type" message. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton --- 25-akpm/arch/i386/pci/acpi.c | 17 ++++------------- 25-akpm/arch/ia64/pci/pci.c | 16 +++------------- 2 files changed, 7 insertions(+), 26 deletions(-) diff -puN arch/i386/pci/acpi.c~tone-down-pci=routeirq-message arch/i386/pci/acpi.c --- 25/arch/i386/pci/acpi.c~tone-down-pci=routeirq-message 2005-02-22 18:53:24.000000000 -0800 +++ 25-akpm/arch/i386/pci/acpi.c 2005-02-22 18:53:24.000000000 -0800 @@ -37,21 +37,12 @@ static int __init pci_acpi_init(void) * also do it here in case there are still broken drivers that * don't use pci_enable_device(). */ - printk(KERN_INFO "** Routing PCI interrupts for all devices because \"pci=routeirq\"\n"); - printk(KERN_INFO "** was specified. If this was required to make a driver work,\n"); - printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n"); - printk(KERN_INFO "** so I can fix the driver.\n"); + printk(KERN_INFO "PCI: Routing PCI interrupts for all devices because \"pci=routeirq\" specified\n"); while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) acpi_pci_irq_enable(dev); - } else { - printk(KERN_INFO "** PCI interrupts are no longer routed automatically. If this\n"); - printk(KERN_INFO "** causes a device to stop working, it is probably because the\n"); - printk(KERN_INFO "** driver failed to call pci_enable_device(). As a temporary\n"); - printk(KERN_INFO "** workaround, the \"pci=routeirq\" argument restores the old\n"); - printk(KERN_INFO "** behavior. If this argument makes the device work again,\n"); - printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n"); - printk(KERN_INFO "** so I can fix the driver.\n"); - } + } else + printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n"); + #ifdef CONFIG_X86_IO_APIC if (acpi_ioapic) print_IO_APIC(); diff -puN arch/ia64/pci/pci.c~tone-down-pci=routeirq-message arch/ia64/pci/pci.c --- 25/arch/ia64/pci/pci.c~tone-down-pci=routeirq-message 2005-02-22 18:53:24.000000000 -0800 +++ 25-akpm/arch/ia64/pci/pci.c 2005-02-22 18:53:24.000000000 -0800 @@ -151,21 +151,11 @@ pci_acpi_init (void) * also do it here in case there are still broken drivers that * don't use pci_enable_device(). */ - printk(KERN_INFO "** Routing PCI interrupts for all devices because \"pci=routeirq\"\n"); - printk(KERN_INFO "** was specified. If this was required to make a driver work,\n"); - printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n"); - printk(KERN_INFO "** so I can fix the driver.\n"); + printk(KERN_INFO "PCI: Routing interrupts for all devices because \"pci=routeirq\" specified\n"); for_each_pci_dev(dev) acpi_pci_irq_enable(dev); - } else { - printk(KERN_INFO "** PCI interrupts are no longer routed automatically. If this\n"); - printk(KERN_INFO "** causes a device to stop working, it is probably because the\n"); - printk(KERN_INFO "** driver failed to call pci_enable_device(). As a temporary\n"); - printk(KERN_INFO "** workaround, the \"pci=routeirq\" argument restores the old\n"); - printk(KERN_INFO "** behavior. If this argument makes the device work again,\n"); - printk(KERN_INFO "** please email the output of \"lspci\" to bjorn.helgaas@hp.com\n"); - printk(KERN_INFO "** so I can fix the driver.\n"); - } + } else + printk(KERN_INFO "PCI: If a device doesn't work, try \"pci=routeirq\". If it helps, post a report\n"); return 0; } _