This commit enables ISA-specific code if and only if CONFIG_{E}ISA is set
in the kernel configuration so that we do not have to maintain
acpi_isa_irq_to_gsi() function for architectures which do not support ISA.Signed-off-by: Tomasz Nowicki <[email protected]> --- drivers/acpi/pci_irq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 41c5e1b..b0e31b6 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c @@ -418,6 +418,7 @@ int acpi_pci_irq_enable(struct pci_dev *dev) * driver reported one, then use it. Exit in any case. */ if (gsi < 0) { +#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA) u32 dev_gsi; /* Interrupt Line values above 0xF are forbidden */ if (dev->irq > 0 && (dev->irq <= 0xF) && @@ -427,10 +428,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev) acpi_register_gsi(&dev->dev, dev_gsi, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW); - } else { - dev_warn(&dev->dev, "PCI INT %c: no GSI\n", - pin_name(pin)); - } + } else +#endif + dev_warn(&dev->dev, "PCI INT %c: no GSI\n", pin_name(pin)); return 0; } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
