Because of making irq_create_acpi_mapping more generic, now we can use it for acpi too. Assumption for now is to use default irq domain.
Signed-off-by: Tomasz Nowicki tomasz.nowicki@linaro.org --- drivers/acpi/plat/arm-core.c | 7 ++++++- kernel/irq/irqdomain.c | 27 --------------------------- 2 files changed, 6 insertions(+), 28 deletions(-)
diff --git a/drivers/acpi/plat/arm-core.c b/drivers/acpi/plat/arm-core.c index 509b847..2e103e7 100644 --- a/drivers/acpi/plat/arm-core.c +++ b/drivers/acpi/plat/arm-core.c @@ -484,7 +484,12 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity) else irq_type = IRQ_TYPE_NONE;
- irq = irq_create_acpi_mapping(gsi, irq_type); + /* + * Create mapping, use default domain. + * TODO: Based on MADT create list of GIC domains and find proper one + * here. + */ + irq = irq_create_mapping_type(NULL, gsi, irq_type); return irq; } EXPORT_SYMBOL_GPL(acpi_register_gsi); diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index bf74a0b..3255c5d 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -490,33 +490,6 @@ unsigned int irq_create_mapping_type(struct irq_domain *domain, } EXPORT_SYMBOL_GPL(irq_create_mapping_type);
-#ifdef CONFIG_ACPI -unsigned int irq_create_acpi_mapping(irq_hw_number_t hwirq, - unsigned int type) -{ - struct irq_domain *domain; - unsigned int virq; - - domain = irq_default_domain; - if (!domain) { - pr_warn("no irq domain found !\n"); - return 0; - } - - /* Create mapping */ - virq = irq_create_mapping(domain, hwirq); - if (!virq) - return virq; - - /* Set type if specified and different than the current one */ - if (type != IRQ_TYPE_NONE && - type != irq_get_trigger_type(virq)) - irq_set_irq_type(virq, type); - return virq; -} -EXPORT_SYMBOL_GPL(irq_create_acpi_mapping); -#endif - /** * irq_dispose_mapping() - Unmap an interrupt * @virq: linux irq number of the interrupt to unmap