Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754272AbaBTXro (ORCPT ); Thu, 20 Feb 2014 18:47:44 -0500 Received: from v094114.home.net.pl ([79.96.170.134]:55764 "HELO v094114.home.net.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1753166AbaBTXrl (ORCPT ); Thu, 20 Feb 2014 18:47:41 -0500 From: "Rafael J. Wysocki" To: Tomasz Nowicki Cc: lenb@kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org Subject: Re: [PATCH v3 1/1] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA. Date: Fri, 21 Feb 2014 01:02:34 +0100 Message-ID: <2537267.YMHbG84COY@vostro.rjw.lan> User-Agent: KMail/4.11.5 (Linux/3.13.0+; KDE/4.11.5; x86_64; ; ) In-Reply-To: <1392902866-5256-1-git-send-email-tomasz.nowicki@linaro.org> References: <1392902866-5256-1-git-send-email-tomasz.nowicki@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="utf-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thursday, February 20, 2014 02:27:46 PM Tomasz Nowicki wrote: > This commit moves ISA-specific code to separate function and makes that > function depend on CONFIG_{E}ISA 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 Queued up for 3.15, thanks! > --- > drivers/acpi/pci_irq.c | 36 +++++++++++++++++++++++++----------- > 1 file changed, 25 insertions(+), 11 deletions(-) > > diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c > index 361b40c..9c62340 100644 > --- a/drivers/acpi/pci_irq.c > +++ b/drivers/acpi/pci_irq.c > @@ -370,6 +370,30 @@ static struct acpi_prt_entry *acpi_pci_irq_lookup(struct pci_dev *dev, int pin) > return NULL; > } > > +#if IS_ENABLED(CONFIG_ISA) || IS_ENABLED(CONFIG_EISA) > +static int acpi_isa_register_gsi(struct pci_dev *dev) > +{ > + u32 dev_gsi; > + > + /* Interrupt Line values above 0xF are forbidden */ > + if (dev->irq > 0 && (dev->irq <= 0xF) && > + (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { > + dev_warn(&dev->dev, "PCI INT %c: no GSI - using ISA IRQ %d\n", > + pin_name(dev->pin), dev->irq); > + acpi_register_gsi(&dev->dev, dev_gsi, > + ACPI_LEVEL_SENSITIVE, > + ACPI_ACTIVE_LOW); > + return 0; > + } > + return -EINVAL; > +} > +#else > +static inline int acpi_isa_register_gsi(struct pci_dev *dev) > +{ > + return -ENODEV; > +} > +#endif > + > int acpi_pci_irq_enable(struct pci_dev *dev) > { > struct acpi_prt_entry *entry; > @@ -416,19 +440,9 @@ int acpi_pci_irq_enable(struct pci_dev *dev) > * driver reported one, then use it. Exit in any case. > */ > if (gsi < 0) { > - u32 dev_gsi; > - /* Interrupt Line values above 0xF are forbidden */ > - if (dev->irq > 0 && (dev->irq <= 0xF) && > - (acpi_isa_irq_to_gsi(dev->irq, &dev_gsi) == 0)) { > - 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); > - } else { > + if (acpi_isa_register_gsi(dev)) > dev_warn(&dev->dev, "PCI INT %c: no GSI\n", > pin_name(pin)); > - } > > kfree(entry); > return 0; > -- I speak only for myself. Rafael J. Wysocki, Intel Open Source Technology Center. -- 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/