diff options
| author | Jiang Liu <jiang.liu@linux.intel.com> | 2015-09-17 08:02:46 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-26 01:53:07 +0200 |
| commit | d323efc786910bcc0c8f8b9f97780c70544ac4df (patch) | |
| tree | 10537319057b7a5f8c3877b1b47d0c778f8f9f28 | |
| parent | ACPI, PCI, irq: Do not share PCI IRQ with ISA IRQ (diff) | |
| download | linux-d323efc786910bcc0c8f8b9f97780c70544ac4df.tar.xz linux-d323efc786910bcc0c8f8b9f97780c70544ac4df.zip | |
ACPI / PCI: Remove duplicated penalty on SCI IRQ
Now we have dedicated interface acpi_penalize_sci_irq() to penalize
ISA IRQ used by ACPI SCI, so remove duplicated code to penalize ACPI SCI
in acpi_irq_penalty_init().
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
| -rw-r--r-- | drivers/acpi/pci_link.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 246e50d22120..7c8408b946ca 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c @@ -498,8 +498,7 @@ int __init acpi_irq_penalty_init(void) PIRQ_PENALTY_PCI_POSSIBLE; } } - /* Add a penalty for the SCI */ - acpi_irq_penalty[acpi_gbl_FADT.sci_interrupt] += PIRQ_PENALTY_PCI_USING; + return 0; } |