Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit 5bb578a

Browse files
linuswRussell King (Oracle)
linusw
authored and
Russell King (Oracle)
committed
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 <[email protected]> Reviewed-by: Arnd Bergmann <[email protected]> Acked-by: Mark Rutland <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]>
1 parent ac9a786 commit 5bb578a

File tree

15 files changed

+6
-27
lines changed

15 files changed

+6
-27
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ struct machine_desc {
5656
void (*init_time)(void);
5757
void (*init_machine)(void);
5858
void (*init_late)(void);
59-
void (*handle_irq)(struct pt_regs *);
6059
void (*restart)(enum reboot_mode, const char *);
6160
};
6261

‎arch/arm/kernel/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,10 +1198,6 @@ void __init setup_arch(char **cmdline_p)
11981198

11991199
reserve_crashkernel();
12001200

1201-
#ifdef CONFIG_GENERIC_IRQ_MULTI_HANDLER
1202-
handle_arch_irq = mdesc->handle_irq;
1203-
#endif
1204-
12051201
#ifdef CONFIG_VT
12061202
#if defined(CONFIG_VGA_CONSOLE)
12071203
conswitchp = &vga_con;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/err.h>
1212
#include <linux/gpio.h>
1313
#include <linux/init.h>
14-
#include <linux/irqchip/mxs.h>
1514
#include <linux/reboot.h>
1615
#include <linux/micrel_phy.h>
1716
#include <linux/of_address.h>
@@ -472,7 +471,6 @@ static const char *const mxs_dt_compat[] __initconst = {
472471
};
473472

474473
DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
475-
.handle_irq = icoll_handle_irq,
476474
.init_machine = mxs_machine_init,
477475
.init_late = mxs_pm_init,
478476
.dt_compat = mxs_dt_compat,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,6 @@ MACHINE_START(AMS_DELTA, "Amstrad E3 (Delta)")
877877
.map_io = ams_delta_map_io,
878878
.init_early = omap1_init_early,
879879
.init_irq = omap1_init_irq,
880-
.handle_irq = omap1_handle_irq,
881880
.init_machine = ams_delta_init,
882881
.init_late = ams_delta_init_late,
883882
.init_time = omap1_timer_init,

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,6 @@ MACHINE_START(NOKIA770, "Nokia 770")
291291
.map_io = omap1_map_io,
292292
.init_early = omap1_init_early,
293293
.init_irq = omap1_init_irq,
294-
.handle_irq = omap1_handle_irq,
295294
.init_machine = omap_nokia770_init,
296295
.init_late = omap1_init_late,
297296
.init_time = omap1_timer_init,

‎arch/arm/mach-omap1/board-osk.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ MACHINE_START(OMAP_OSK, "TI-OSK")
389389
.map_io = omap1_map_io,
390390
.init_early = omap1_init_early,
391391
.init_irq = omap1_init_irq,
392-
.handle_irq = omap1_handle_irq,
393392
.init_machine = osk_init,
394393
.init_late = omap1_init_late,
395394
.init_time = omap1_timer_init,

‎arch/arm/mach-omap1/board-palmte.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,6 @@ MACHINE_START(OMAP_PALMTE, "OMAP310 based Palm Tungsten E")
259259
.map_io = omap1_map_io,
260260
.init_early = omap1_init_early,
261261
.init_irq = omap1_init_irq,
262-
.handle_irq = omap1_handle_irq,
263262
.init_machine = omap_palmte_init,
264263
.init_late = omap1_init_late,
265264
.init_time = omap1_timer_init,

‎arch/arm/mach-omap1/board-sx1.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,6 @@ MACHINE_START(SX1, "OMAP310 based Siemens SX1")
338338
.map_io = omap1_map_io,
339339
.init_early = omap1_init_early,
340340
.init_irq = omap1_init_irq,
341-
.handle_irq = omap1_handle_irq,
342341
.init_machine = omap_sx1_init,
343342
.init_late = omap1_init_late,
344343
.init_time = omap1_timer_init,

‎arch/arm/mach-omap1/irq.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
*/
3838
#include <linux/gpio.h>
3939
#include <linux/init.h>
40+
#include <linux/irq.h>
4041
#include <linux/module.h>
4142
#include <linux/sched.h>
4243
#include <linux/interrupt.h>
@@ -254,4 +255,6 @@ void __init omap1_init_irq(void)
254255
ct = irq_data_get_chip_type(d);
255256
ct->chip.irq_unmask(d);
256257
}
258+
259+
set_handle_irq(omap1_handle_irq);
257260
}

‎arch/arm/mach-pxa/gumstix.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ MACHINE_START(GUMSTIX, "Gumstix")
233233
.map_io = pxa25x_map_io,
234234
.nr_irqs = PXA_NR_IRQS,
235235
.init_irq = pxa25x_init_irq,
236-
.handle_irq = pxa25x_handle_irq,
237236
.init_time = pxa_timer_init,
238237
.init_machine = gumstix_init,
239238
.restart = pxa_restart,

‎arch/arm/mach-pxa/pxa25x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ static int pxa25x_set_wake(struct irq_data *d, unsigned int on)
143143
void __init pxa25x_init_irq(void)
144144
{
145145
pxa_init_irq(32, pxa25x_set_wake);
146+
set_handle_irq(pxa25x_handle_irq);
146147
}
147148

148149
static int __init __init

‎arch/arm/mach-pxa/pxa27x.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ static int pxa27x_set_wake(struct irq_data *d, unsigned int on)
228228
void __init pxa27x_init_irq(void)
229229
{
230230
pxa_init_irq(34, pxa27x_set_wake);
231+
set_handle_irq(pxa27x_handle_irq);
231232
}
232233

233234
static int __init

‎arch/arm/mach-pxa/spitz.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,6 @@ MACHINE_START(SPITZ, "SHARP Spitz")
10431043
.map_io = pxa27x_map_io,
10441044
.nr_irqs = PXA_NR_IRQS,
10451045
.init_irq = pxa27x_init_irq,
1046-
.handle_irq = pxa27x_handle_irq,
10471046
.init_machine = spitz_init,
10481047
.init_time = pxa_timer_init,
10491048
.restart = spitz_restart,
@@ -1056,7 +1055,6 @@ MACHINE_START(BORZOI, "SHARP Borzoi")
10561055
.map_io = pxa27x_map_io,
10571056
.nr_irqs = PXA_NR_IRQS,
10581057
.init_irq = pxa27x_init_irq,
1059-
.handle_irq = pxa27x_handle_irq,
10601058
.init_machine = spitz_init,
10611059
.init_time = pxa_timer_init,
10621060
.restart = spitz_restart,
@@ -1069,7 +1067,6 @@ MACHINE_START(AKITA, "SHARP Akita")
10691067
.map_io = pxa27x_map_io,
10701068
.nr_irqs = PXA_NR_IRQS,
10711069
.init_irq = pxa27x_init_irq,
1072-
.handle_irq = pxa27x_handle_irq,
10731070
.init_machine = spitz_init,
10741071
.init_time = pxa_timer_init,
10751072
.restart = spitz_restart,

‎drivers/irqchip/irq-mxs.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ static int __init icoll_of_init(struct device_node *np,
201201
stmp_reset_block(icoll_priv.ctrl);
202202

203203
icoll_add_domain(np, ICOLL_NUM_IRQS);
204+
set_handle_irq(icoll_handle_irq);
204205

205206
return 0;
206207
}

‎include/linux/irqchip/mxs.h

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)