Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f30a6484f1bcb410d0af0c24f34b8e3d92682a05

Authored by Geert Uytterhoeven
1 parent d890d73995
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

m68k/irq: Remove obsolete support for user vector interrupt fixups 

It was used on Apollo only, before its conversion to genirq.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

Showing 9 changed files with 10 additions and 20 deletions Side-by-side Diff

arch/m68k/apollo/dn_ints.c
Diff comments   View file @ f30a648
... ... @@ -41,7 +41,7 @@
41 41  
42 42 void __init dn_init_IRQ(void)
43 43 {
44   - m68k_setup_user_interrupt(VEC_USER + 96, 16, NULL);
  44 + m68k_setup_user_interrupt(VEC_USER + 96, 16);
45 45 m68k_setup_irq_controller(&apollo_irq_chip, handle_fasteoi_irq,
46 46 IRQ_APOLLO, 16);
47 47 }
arch/m68k/atari/ataints.c
Diff comments   View file @ f30a648
... ... @@ -137,7 +137,7 @@
137 137  
138 138 void __init atari_init_IRQ(void)
139 139 {
140   - m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER, NULL);
  140 + m68k_setup_user_interrupt(VEC_USER, NUM_ATARI_SOURCES - IRQ_USER);
141 141 m68k_setup_irq_controller(&atari_irq_chip, handle_simple_irq, 1,
142 142 NUM_ATARI_SOURCES - 1);
143 143  
arch/m68k/bvme6000/config.c
Diff comments   View file @ f30a648
... ... @@ -86,7 +86,7 @@
86 86 */
87 87 static void __init bvme6000_init_IRQ(void)
88 88 {
89   - m68k_setup_user_interrupt(VEC_USER, 192, NULL);
  89 + m68k_setup_user_interrupt(VEC_USER, 192);
90 90 }
91 91  
92 92 void __init config_bvme6000(void)
arch/m68k/include/asm/irq.h
Diff comments   View file @ f30a648
... ... @@ -70,9 +70,7 @@
70 70 extern void m68k_irq_shutdown(struct irq_data *data);
71 71 extern void m68k_setup_auto_interrupt(void (*handler)(unsigned int,
72 72 struct pt_regs *));
73   -extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
74   - void (*handler)(unsigned int,
75   - struct pt_regs *));
  73 +extern void m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt);
76 74 extern void m68k_setup_irq_controller(struct irq_chip *,
77 75 void (*handle)(unsigned int irq,
78 76 struct irq_desc *desc),
arch/m68k/kernel/entry_mm.S
Diff comments   View file @ f30a648
... ... @@ -48,7 +48,7 @@
48 48 .globl sys_fork, sys_clone, sys_vfork
49 49 .globl ret_from_interrupt, bad_interrupt
50 50 .globl auto_irqhandler_fixup
51   -.globl user_irqvec_fixup, user_irqhandler_fixup
  51 +.globl user_irqvec_fixup
52 52  
53 53 .text
54 54 ENTRY(buserr)
... ... @@ -240,7 +240,6 @@
240 240  
241 241 movel %sp,%sp@-
242 242 movel %d0,%sp@- | put vector # on stack
243   -user_irqhandler_fixup = . + 2
244 243 jsr do_IRQ | process the IRQ
245 244 addql #8,%sp | pop parameters off stack
246 245  
arch/m68k/kernel/ints.c
Diff comments   View file @ f30a648
... ... @@ -28,7 +28,6 @@
28 28 #endif
29 29  
30 30 extern u32 auto_irqhandler_fixup[];
31   -extern u32 user_irqhandler_fixup[];
32 31 extern u16 user_irqvec_fixup[];
33 32  
34 33 static int m68k_first_user_vec;
35 34  
36 35  
... ... @@ -91,16 +90,12 @@
91 90 * m68k_setup_user_interrupt
92 91 * @vec: first user vector interrupt to handle
93 92 * @cnt: number of active user vector interrupts
94   - * @handler: called from user vector interrupts
95 93 *
96 94 * setup user vector interrupts, this includes activating the specified range
97 95 * of interrupts, only then these interrupts can be requested (note: this is
98   - * different from auto vector interrupts). An optional handler can be installed
99   - * to be called instead of the default do_IRQ(), it will be called
100   - * with irq numbers starting from IRQ_USER.
  96 + * different from auto vector interrupts).
101 97 */
102   -void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt,
103   - void (*handler)(unsigned int, struct pt_regs *))
  98 +void __init m68k_setup_user_interrupt(unsigned int vec, unsigned int cnt)
104 99 {
105 100 int i;
106 101  
... ... @@ -109,8 +104,6 @@
109 104 for (i = 0; i < cnt; i++)
110 105 irq_set_chip(IRQ_USER + i, &user_irq_chip);
111 106 *user_irqvec_fixup = vec - IRQ_USER;
112   - if (handler)
113   - *user_irqhandler_fixup = (u32)handler;
114 107 flush_icache();
115 108 }
116 109  
arch/m68k/mvme147/config.c
Diff comments   View file @ f30a648
... ... @@ -81,7 +81,7 @@
81 81  
82 82 void __init mvme147_init_IRQ(void)
83 83 {
84   - m68k_setup_user_interrupt(VEC_USER, 192, NULL);
  84 + m68k_setup_user_interrupt(VEC_USER, 192);
85 85 }
86 86  
87 87 void __init config_mvme147(void)
arch/m68k/mvme16x/config.c
Diff comments   View file @ f30a648
... ... @@ -117,7 +117,7 @@
117 117  
118 118 static void __init mvme16x_init_IRQ (void)
119 119 {
120   - m68k_setup_user_interrupt(VEC_USER, 192, NULL);
  120 + m68k_setup_user_interrupt(VEC_USER, 192);
121 121 }
122 122  
123 123 #define pcc2chip ((volatile u_char *)0xfff42000)
arch/m68k/sun3/sun3ints.c
Diff comments   View file @ f30a648
... ... @@ -109,7 +109,7 @@
109 109  
110 110 m68k_setup_irq_controller(&sun3_irq_chip, handle_level_irq, IRQ_AUTO_1,
111 111 7);
112   - m68k_setup_user_interrupt(VEC_USER, 128, NULL);
  112 + m68k_setup_user_interrupt(VEC_USER, 128);
113 113  
114 114 if (request_irq(IRQ_AUTO_5, sun3_int5, 0, "int5", NULL))
115 115 pr_err("Couldn't register %s interrupt\n", "int5");