lkml.org 
[lkml]   [2014]   [Feb]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 1/2] ACPI, PCI, ISA: Call ISA-specific code only for architectures which support ISA.


On 15.02.2014 02:05, Rafael J. Wysocki wrote:
> On Monday, February 10, 2014 02:00:10 PM Tomasz Nowicki wrote:
>> 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)
>
> Can you please move the code in question into a separate function and make
> that function depend on the above (with an empty stub for when they are not
> enabled)?
Thanks for suggestion, I will resend as next version.
>
>> 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;
>> }
>>
>


\
 
 \ /
  Last update: 2014-02-20 04:41    [W:0.088 / U:0.320 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site