Commit 019ae484 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

[PATCH] use modern format for PCI->APIC IRQ transform printks

Use pci_name() rather than "(B%d,I%d,P%d)" when printing PCI IRQ
information.  Compiled but untested.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 80221651
...@@ -737,7 +737,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign) ...@@ -737,7 +737,7 @@ static int pcibios_lookup_irq(struct pci_dev *dev, int assign)
if (!pirq_table) if (!pirq_table)
return 0; 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); info = pirq_get_info(dev);
if (!info) { if (!info) {
DBG(" -> not found in routing table\n"); DBG(" -> not found in routing table\n");
...@@ -894,16 +894,16 @@ static void __init pcibios_fixup_irqs(void) ...@@ -894,16 +894,16 @@ static void __init pcibios_fixup_irqs(void)
irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
PCI_SLOT(bridge->devfn), pin); PCI_SLOT(bridge->devfn), pin);
if (irq >= 0) if (irq >= 0)
printk(KERN_WARNING "PCI: using PPB(B%d,I%d,P%d) to get irq %d\n", printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n",
bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq); pci_name(bridge), 'A' + pin, irq);
} }
if (irq >= 0) { if (irq >= 0) {
if (use_pci_vector() && if (use_pci_vector() &&
!platform_legacy_irq(irq)) !platform_legacy_irq(irq))
irq = IO_APIC_VECTOR(irq); irq = IO_APIC_VECTOR(irq);
printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n", printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
dev->bus->number, PCI_SLOT(dev->devfn), pin, irq); pci_name(dev), 'A' + pin, irq);
dev->irq = irq; dev->irq = irq;
} }
} }
...@@ -1053,8 +1053,8 @@ static int pirq_enable_irq(struct pci_dev *dev) ...@@ -1053,8 +1053,8 @@ static int pirq_enable_irq(struct pci_dev *dev)
irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number, irq = IO_APIC_get_PCI_irq_vector(bridge->bus->number,
PCI_SLOT(bridge->devfn), pin); PCI_SLOT(bridge->devfn), pin);
if (irq >= 0) if (irq >= 0)
printk(KERN_WARNING "PCI: using PPB(B%d,I%d,P%d) to get irq %d\n", printk(KERN_WARNING "PCI: using PPB %s[%c] to get irq %d\n",
bridge->bus->number, PCI_SLOT(bridge->devfn), pin, irq); pci_name(bridge), 'A' + pin, irq);
dev = bridge; dev = bridge;
} }
dev = temp_dev; dev = temp_dev;
...@@ -1063,8 +1063,8 @@ static int pirq_enable_irq(struct pci_dev *dev) ...@@ -1063,8 +1063,8 @@ static int pirq_enable_irq(struct pci_dev *dev)
if (!platform_legacy_irq(irq)) if (!platform_legacy_irq(irq))
irq = IO_APIC_VECTOR(irq); irq = IO_APIC_VECTOR(irq);
#endif #endif
printk(KERN_INFO "PCI->APIC IRQ transform: (B%d,I%d,P%d) -> %d\n", printk(KERN_INFO "PCI->APIC IRQ transform: %s[%c] -> IRQ %d\n",
dev->bus->number, PCI_SLOT(dev->devfn), pin, irq); pci_name(dev), 'A' + pin, irq);
dev->irq = irq; dev->irq = irq;
return 0; return 0;
} else } else
......
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