1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c
index 0eefa12e648c..23a032490130 100644
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
@@ -459,19 +459,19 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
          */
         if (gsi < 0) {
                 u32 dev_gsi;
-                dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin));
                 /* Interrupt Line values above 0xF are forbidden */
                 if (dev->irq > 0 && (dev->irq <= 0xF) &&
                     (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) {
-                        printk(" - using ISA IRQ %d\n", dev->irq);
+                        dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n",
+                                 pin_name(pin), dev->irq);
                         acpi_register_gsi(&dev->dev, dev_gsi,
                                           ACPI_LEVEL_SENSITIVE,
                                           ACPI_ACTIVE_LOW);
-                        return 0;
                 } else {
-                        printk("\n");
-                        return 0;
+                        dev_warn(&dev->dev, "PCI INT %c: no GSI\n",
+                                 pin_name(pin));
                 }
+                return 0;
         }
 
         rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity);
@@ -495,11 +495,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev)
         return 0;
 }
 
-/* FIXME: implement x86/x86_64 version */
-void __attribute__ ((weak)) acpi_unregister_gsi(u32 i)
-{
-}
-
 void acpi_pci_irq_disable(struct pci_dev *dev)
 {
         struct acpi_prt_entry *entry;