aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2016-04-17 13:36:56 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-05-04 19:10:32 -0400
commit9e5ed6d1fb87dc3ff0c2a94ed75fe82027a9f597 (patch)
tree4ce9445e20dce7e6ed1ce881d1291c63e61f9937
parent1fcb6a813c4f67a0ba189b0d057b70ba084f6e1a (diff)
ACPI,PCI,IRQ: remove SCI penalize function
Removing the SCI penalize function as the penalty is now calculated on the fly. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
-rw-r--r--arch/x86/kernel/acpi/boot.c1
-rw-r--r--drivers/acpi/pci_link.c4
-rw-r--r--include/linux/acpi.h1
3 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 8c2f1ef6ca23..edf48404d15d 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -445,7 +445,6 @@ static void __init acpi_sci_ioapic_setup(u8 bus_irq, u16 polarity, u16 trigger,
445 polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK; 445 polarity = acpi_sci_flags & ACPI_MADT_POLARITY_MASK;
446 446
447 mp_override_legacy_irq(bus_irq, polarity, trigger, gsi); 447 mp_override_legacy_irq(bus_irq, polarity, trigger, gsi);
448 acpi_penalize_sci_irq(bus_irq, trigger, polarity);
449 448
450 /* 449 /*
451 * stash over-ride to indicate we've been here 450 * stash over-ride to indicate we've been here
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c
index ab39208ba7e5..8fc7323ed3e8 100644
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
@@ -848,10 +848,6 @@ bool acpi_isa_irq_available(int irq)
848 acpi_irq_get_penalty(irq) < PIRQ_PENALTY_ISA_ALWAYS); 848 acpi_irq_get_penalty(irq) < PIRQ_PENALTY_ISA_ALWAYS);
849} 849}
850 850
851void acpi_penalize_sci_irq(int irq, int trigger, int polarity)
852{
853}
854
855/* 851/*
856 * Over-ride default table to reserve additional IRQs for use by ISA 852 * Over-ride default table to reserve additional IRQs for use by ISA
857 * e.g. acpi_irq_isa=5 853 * e.g. acpi_irq_isa=5
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 06ed7e54033e..0f413170c8f9 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -311,7 +311,6 @@ struct pci_dev;
311int acpi_pci_irq_enable (struct pci_dev *dev); 311int acpi_pci_irq_enable (struct pci_dev *dev);
312void acpi_penalize_isa_irq(int irq, int active); 312void acpi_penalize_isa_irq(int irq, int active);
313bool acpi_isa_irq_available(int irq); 313bool acpi_isa_irq_available(int irq);
314void acpi_penalize_sci_irq(int irq, int trigger, int polarity);
315void acpi_pci_irq_disable (struct pci_dev *dev); 314void acpi_pci_irq_disable (struct pci_dev *dev);
316 315
317extern int ec_read(u8 addr, u8 *val); 316extern int ec_read(u8 addr, u8 *val);