Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ACPI: Fix logging when no pci_irq is allocated

Work around a defect in the printk subsystem introduced by a
logging change.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Joe Perches and committed by
Rafael J. Wysocki
66fd3835 cd73018f

+5 -5
+5 -5
drivers/acpi/pci_irq.c
··· 459 459 */ 460 460 if (gsi < 0) { 461 461 u32 dev_gsi; 462 - dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin)); 463 462 /* Interrupt Line values above 0xF are forbidden */ 464 463 if (dev->irq > 0 && (dev->irq <= 0xF) && 465 464 (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { 466 - printk(" - using ISA IRQ %d\n", dev->irq); 465 + dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n", 466 + pin_name(pin), dev->irq); 467 467 acpi_register_gsi(&dev->dev, dev_gsi, 468 468 ACPI_LEVEL_SENSITIVE, 469 469 ACPI_ACTIVE_LOW); 470 - return 0; 471 470 } else { 472 - printk("\n"); 473 - return 0; 471 + dev_warn(&dev->dev, "PCI INT %c: no GSI\n", 472 + pin_name(pin)); 474 473 } 474 + return 0; 475 475 } 476 476 477 477 rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);