aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-11-20 11:44:01 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-11-21 10:00:19 +0000
commit5ae38e47eae0c7f2889ec62af9051a7be0f4fea1 (patch)
tree5a6febf8f20ee529d83d48e5610ad6bbe19da1f1
parentd03f91ab4a6d71cd8cbf6090223e2c97e7b355e1 (diff)
downloadleg-kernel-5ae38e47eae0c7f2889ec62af9051a7be0f4fea1.tar.gz
ARM: ACPI: remove irq type switching from core
ARM/ARM64 only support GIC type under ACPI so remove the various x86 style IRQ type switching and the EISA support. Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
-rw-r--r--drivers/acpi/plat/arm-core.c43
1 files changed, 1 insertions, 42 deletions
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c
index b77af0f19f07..6710631df118 100644
--- a/drivers/acpi/plat/arm-core.c
+++ b/drivers/acpi/plat/arm-core.c
@@ -224,29 +224,6 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
}
EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
-static int acpi_register_gsi_pic(struct device *dev, u32 gsi,
- int trigger, int polarity)
-{
-#ifdef CONFIG_PCI
- /*
- * Make sure all (legacy) PCI IRQs are set as level-triggered.
- */
- if (trigger == ACPI_LEVEL_SENSITIVE)
- eisa_set_level_irq(gsi);
-#endif
-
- return gsi;
-}
-
-static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi,
- int trigger, int polarity)
-{
- return gsi;
-}
-
-int (*__acpi_register_gsi)(struct device *dev, u32 gsi,
- int trigger, int polarity) = acpi_register_gsi_pic;
-
/*
* success: return IRQ number (>=0)
* failure: return < 0
@@ -256,8 +233,6 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
unsigned int irq;
unsigned int plat_gsi = gsi;
- plat_gsi = (*__acpi_register_gsi)(dev, gsi, trigger, polarity);
-
irq = gsi_to_irq(plat_gsi);
return irq;
@@ -269,20 +244,6 @@ void acpi_unregister_gsi(u32 gsi)
}
EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
-void __init acpi_set_irq_model_pic(void)
-{
- acpi_irq_model = ACPI_IRQ_MODEL_PIC;
- __acpi_register_gsi = acpi_register_gsi_pic;
- acpi_ioapic = 0;
-}
-
-void __init acpi_set_irq_model_gic(void)
-{
- acpi_irq_model = ACPI_IRQ_MODEL_GIC;
- __acpi_register_gsi = acpi_register_gsi_ioapic;
- acpi_ioapic = 1;
-}
-
static int __initdata setup_possible_cpus = -1;
static int __init _setup_possible_cpus(char *str)
{
@@ -550,9 +511,7 @@ static void __init acpi_process_madt(void)
/*
* Parse MADT IO-APIC entries
*/
- error = acpi_parse_madt_ioapic_entries();
- if (!error)
- acpi_set_irq_model_gic();
+ acpi_parse_madt_ioapic_entries();
}
}