Commit 5bb578a0 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King (Oracle)
Browse files

ARM: 9298/1: Drop custom mdesc->handle_irq() 



ARM exclusively uses GENERIC_IRQ_MULTI_HANDLER, so at some point
set_handle_irq() needs to be called to handle system-wide
interrupts.

For all DT-enabled boards, this call happens down in the
drivers/irqchip subsystem, after locating the target irqchip
driver from the device tree.

We still have a few instances of the boardfiles with machine
descriptors passing a machine-specific .handle_irq() to the
ARM kernel core.

Get rid of this by letting the few remaining machines consistently
call set_handle_irq() from the end of the .init_irq() callback
instead and diet down one member from the machine descriptor.

Cc: Marc Zyngier <maz@kernel.org>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent ac9a7868

arch/arm/include/asm/mach/arch.h

+0 −1
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ struct machine_desc { 
	void			(*init_time)(void);

	void			(*init_machine)(void);

	void			(*init_late)(void);

	void			(*handle_irq)(struct pt_regs *);

	void			(*restart)(enum reboot_mode, const char *);

};

arch/arm/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -1198,10 +1198,6 @@ void __init setup_arch(char **cmdline_p) 


	reserve_crashkernel();



#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER

	handle_arch_irq = mdesc->handle_irq;

#endif



#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

	conswitchp = &vga_con;

arch/arm/mach-mxs/mach-mxs.c

+0 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@ 
#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/init.h>

#include <linux/irqchip/mxs.h>

#include <linux/reboot.h>

#include <linux/micrel_phy.h>

#include <linux/of_address.h>
@@ -472,7 +471,6 @@ static const char *const mxs_dt_compat[] __initconst = { 
};



DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")

	.handle_irq	= icoll_handle_irq,

	.init_machine	= mxs_machine_init,

	.init_late      = mxs_pm_init,

	.dt_compat	= mxs_dt_compat,

arch/arm/mach-omap1/board-ams-delta.c

+0 −1
Original line number Diff line number Diff line
@@ -877,7 +877,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)") 
	.map_io		= ams_delta_map_io,

	.init_early	= omap1_init_early,

	.init_irq	= omap1_init_irq,

	.handle_irq	= omap1_handle_irq,

	.init_machine	= ams_delta_init,

	.init_late	= ams_delta_init_late,

	.init_time	= omap1_timer_init,

arch/arm/mach-omap1/board-nokia770.c

+0 −1
Original line number Diff line number Diff line
@@ -291,7 +291,6 @@ MACHINE_START(NOKIA770, "Nokia 770") 
	.map_io		= omap1_map_io,

	.init_early     = omap1_init_early,

	.init_irq	= omap1_init_irq,

	.handle_irq	= omap1_handle_irq,

	.init_machine	= omap_nokia770_init,

	.init_late	= omap1_init_late,

	.init_time	= omap1_timer_init,