lkml.org 
[lkml]   [2014]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA.
    Date
    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 <tomasz.nowicki@linaro.org>
    ---
    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


    \
     
     \ /
      Last update: 2014-02-13 18:01    [W:23.389 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site