Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752887AbaBJNAl (ORCPT ); Mon, 10 Feb 2014 08:00:41 -0500 Received: from mail-ee0-f48.google.com ([74.125.83.48]:34239 "EHLO mail-ee0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751851AbaBJNAg (ORCPT ); Mon, 10 Feb 2014 08:00:36 -0500 From: Tomasz Nowicki To: lenb@kernel.org, rjw@rjwysocki.net Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, Tomasz Nowicki Subject: [PATCH 1/2] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA. Date: Mon, 10 Feb 2014 14:00:10 +0100 Message-Id: <1392037211-29349-1-git-send-email-tomasz.nowicki@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/