Commit b313ada8 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

irqchip: armada-370-xp: move IRQ handler to avoid forward declaration 



If we move the IRQ handler function above the initialization function,
we avoid a forward declaration. This wasn't done as part of the
previous commit, in order to increase the readibility of the previous
commit, who was also moving the IRQ controller driver from arch/arm to
drivers/irqchip.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 9339d432

drivers/irqchip/irq-armada-370-xp.c

+40 −43
Original line number Diff line number Diff line
@@ -205,49 +205,6 @@ static struct irq_domain_ops armada_370_xp_mpic_irq_ops = { 
	.xlate = irq_domain_xlate_onecell,

};



static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs);



static int __init armada_370_xp_mpic_of_init(struct device_node *node,

					     struct device_node *parent)

{

	u32 control;



	main_int_base = of_iomap(node, 0);

	per_cpu_int_base = of_iomap(node, 1);



	BUG_ON(!main_int_base);

	BUG_ON(!per_cpu_int_base);



	control = readl(main_int_base + ARMADA_370_XP_INT_CONTROL);



	armada_370_xp_mpic_domain =

		irq_domain_add_linear(node, (control >> 2) & 0x3ff,

				&armada_370_xp_mpic_irq_ops, NULL);



	if (!armada_370_xp_mpic_domain)

		panic("Unable to add Armada_370_Xp MPIC irq domain (DT)\n");



	irq_set_default_host(armada_370_xp_mpic_domain);



#ifdef CONFIG_SMP

	armada_xp_mpic_smp_cpu_init();



	/*

	 * Set the default affinity from all CPUs to the boot cpu.

	 * This is required since the MPIC doesn't limit several CPUs

	 * from acknowledging the same interrupt.

	 */

	cpumask_clear(irq_default_affinity);

	cpumask_set_cpu(smp_processor_id(), irq_default_affinity);



#endif



	set_handle_irq(armada_370_xp_handle_irq);



	return 0;

}



static asmlinkage void __exception_irq_entry

armada_370_xp_handle_irq(struct pt_regs *regs)

{
@@ -291,4 +248,44 @@ armada_370_xp_handle_irq(struct pt_regs *regs) 
	} while (1);

}



static int __init armada_370_xp_mpic_of_init(struct device_node *node,

					     struct device_node *parent)

{

	u32 control;



	main_int_base = of_iomap(node, 0);

	per_cpu_int_base = of_iomap(node, 1);



	BUG_ON(!main_int_base);

	BUG_ON(!per_cpu_int_base);



	control = readl(main_int_base + ARMADA_370_XP_INT_CONTROL);



	armada_370_xp_mpic_domain =

		irq_domain_add_linear(node, (control >> 2) & 0x3ff,

				&armada_370_xp_mpic_irq_ops, NULL);



	if (!armada_370_xp_mpic_domain)

		panic("Unable to add Armada_370_Xp MPIC irq domain (DT)\n");



	irq_set_default_host(armada_370_xp_mpic_domain);



#ifdef CONFIG_SMP

	armada_xp_mpic_smp_cpu_init();



	/*

	 * Set the default affinity from all CPUs to the boot cpu.

	 * This is required since the MPIC doesn't limit several CPUs

	 * from acknowledging the same interrupt.

	 */

	cpumask_clear(irq_default_affinity);

	cpumask_set_cpu(smp_processor_id(), irq_default_affinity);



#endif



	set_handle_irq(armada_370_xp_handle_irq);



	return 0;

}



IRQCHIP_DECLARE(armada_370_xp_mpic, "marvell,mpic", armada_370_xp_mpic_of_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE