diff options
Diffstat (limited to 'drivers/acpi/pci_irq.c')
-rw-r--r-- | drivers/acpi/pci_irq.c | 15 |
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) | |||
459 | */ | 459 | */ |
460 | if (gsi < 0) { | 460 | if (gsi < 0) { |
461 | u32 dev_gsi; | 461 | u32 dev_gsi; |
462 | dev_warn(&dev->dev, "PCI INT %c: no GSI", pin_name(pin)); | ||
463 | /* Interrupt Line values above 0xF are forbidden */ | 462 | /* Interrupt Line values above 0xF are forbidden */ |
464 | if (dev->irq > 0 && (dev->irq <= 0xF) && | 463 | if (dev->irq > 0 && (dev->irq <= 0xF) && |
465 | (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { | 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 | acpi_register_gsi(&dev->dev, dev_gsi, | 467 | acpi_register_gsi(&dev->dev, dev_gsi, |
468 | ACPI_LEVEL_SENSITIVE, | 468 | ACPI_LEVEL_SENSITIVE, |
469 | ACPI_ACTIVE_LOW); | 469 | ACPI_ACTIVE_LOW); |
470 | return 0; | ||
471 | } else { | 470 | } else { |
472 | printk("\n"); | 471 | dev_warn(&dev->dev, "PCI INT %c: no GSI\n", |
473 | return 0; | 472 | pin_name(pin)); |
474 | } | 473 | } |
474 | return 0; | ||
475 | } | 475 | } |
476 | 476 | ||
477 | rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity); | 477 | rc = acpi_register_gsi(&dev->dev, gsi, triggering, polarity); |
@@ -495,11 +495,6 @@ int acpi_pci_irq_enable(struct pci_dev *dev) | |||
495 | return 0; | 495 | return 0; |
496 | } | 496 | } |
497 | 497 | ||
498 | /* FIXME: implement x86/x86_64 version */ | ||
499 | void __attribute__ ((weak)) acpi_unregister_gsi(u32 i) | ||
500 | { | ||
501 | } | ||
502 | |||
503 | void acpi_pci_irq_disable(struct pci_dev *dev) | 498 | void acpi_pci_irq_disable(struct pci_dev *dev) |
504 | { | 499 | { |
505 | struct acpi_prt_entry *entry; | 500 | struct acpi_prt_entry *entry; |