Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e66c49b5 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

arm: omap: irq: drop .handle_irq and .init_irq fields 



now we can safely drop those fields from our machine_desc.

While at that, also drop the now unused omap_intc_of_init()
definition.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent b65ecd46

arch/arm/mach-omap2/board-generic.c

+0 −14
Original line number Diff line number Diff line
@@ -52,8 +52,6 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap242x_map_io,

	.init_early	= omap2420_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap2_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.dt_compat	= omap242x_boards_compat,
@@ -71,8 +69,6 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap243x_map_io,

	.init_early	= omap2430_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap2_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_time	= omap2_sync32k_timer_init,

	.dt_compat	= omap243x_boards_compat,
@@ -91,8 +87,6 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,
@@ -109,8 +103,6 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3630_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_sync32k_timer_init,
@@ -128,8 +120,6 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3430_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_secure_sync32k_timer_init,
@@ -146,8 +136,6 @@ DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= am35xx_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= omap3_init_late,

	.init_time	= omap3_gptimer_timer_init,
@@ -166,8 +154,6 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)") 
	.reserve	= omap_reserve,

	.map_io		= am33xx_map_io,

	.init_early	= am33xx_init_early,

	.init_irq	= omap_intc_of_init,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= omap_generic_init,

	.init_late	= am33xx_init_late,

	.init_time	= omap3_gptimer_timer_init,

arch/arm/mach-omap2/common.h

+0 −1
Original line number Diff line number Diff line
@@ -221,7 +221,6 @@ void omap3_intc_prepare_idle(void); 
void omap3_intc_resume_idle(void);

void omap2_intc_handle_irq(struct pt_regs *regs);

void omap3_intc_handle_irq(struct pt_regs *regs);

void omap_intc_of_init(void);

void omap_gic_of_init(void);



#ifdef CONFIG_CACHE_L2X0

arch/arm/mach-omap2/irq.c

+0 −5
Original line number Diff line number Diff line
@@ -322,11 +322,6 @@ static int __init intc_of_init(struct device_node *node, 


IRQCHIP_DECLARE(omap_intc, "ti,omap2-intc", intc_of_init);



void __init omap_intc_of_init(void)

{

	of_irq_init(&irqchip_of_match_omap_intc);

}



asmlinkage void __exception_irq_entry omap3_intc_handle_irq(struct pt_regs *regs)

{

	omap_intc_handle_irq(regs);