From: Bjorn Helgaas Use pci_name() rather than "(B%d,I%d,P%d)" when printing PCI IRQ information. Compiled but untested. Signed-off-by: Bjorn Helgaas Signed-off-by: Andrew Morton --- 25-akpm/arch/i386/pci/irq.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff -puN arch/i386/pci/irq.c~use-modern-format-for-pci-apic-irq-transform-printks arch/i386/pci/irq.c --- 25/arch/i386/pci/irq.c~use-modern-format-for-pci-apic-irq-transform-printks 2005-01-10 17:29:40.184777904 -0800 +++ 25-akpm/arch/i386/pci/irq.c 2005-01-10 17:29:40.189777144 -0800 @@ -737,7 +737,7 @@ static int pcibios_lookup_irq(struct pci if (!pirq_table) return 0; - DBG("IRQ for %s:%d", pci_name(dev), pin); + DBG("IRQ for %s[%c]", pci_name(dev), 'A' + pin); info = pirq_get_info(dev); if (!info) { DBG(" -> not found in routing table\n"); @@ -894,16 +894,16 @@ static void __init pcibios_fixup_irqs(vo irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, PCI_SLOT(bridge->devfn), pin); if (irq >= 0) - printk(KERN_WARNING "PCI: using PPB(B%d,I%d,P%d) to get irq %d\n", - bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq); + printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", + pci_name(bridge), 'A' + pin, irq); } if (irq >= 0) { if (use_pci_vector() && !platform_legacy_irq(irq)) irq = IO_APIC_VECTOR(irq); - printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n", - dev->bus->number, PCI_SLOT(dev->devfn), pin, irq); + printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n", + pci_name(dev), 'A' + pin, irq); dev->irq = irq; } } @@ -1053,8 +1053,8 @@ static int pirq_enable_irq(struct pci_de irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, PCI_SLOT(bridge->devfn), pin); if (irq >= 0) - printk(KERN_WARNING "PCI: using PPB(B%d,I%d,P%d) to get irq %d\n", - bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq); + printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n", + pci_name(bridge), 'A' + pin, irq); dev = bridge; } dev = temp_dev; @@ -1063,8 +1063,8 @@ static int pirq_enable_irq(struct pci_de if (!platform_legacy_irq(irq)) irq = IO_APIC_VECTOR(irq); #endif - printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n", - dev->bus->number, PCI_SLOT(dev->devfn), pin, irq); + printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n", + pci_name(dev), 'A' + pin, irq); dev->irq = irq; return 0; } else _