hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f
kernel/arch/mips/sgi-ip22/ip22-int.c
....@@ -159,36 +159,7 @@
159159 irq_exit();
160160 }
161161
162
-static struct irqaction local0_cascade = {
163
- .handler = no_action,
164
- .flags = IRQF_NO_THREAD,
165
- .name = "local0 cascade",
166
-};
167
-
168
-static struct irqaction local1_cascade = {
169
- .handler = no_action,
170
- .flags = IRQF_NO_THREAD,
171
- .name = "local1 cascade",
172
-};
173
-
174
-static struct irqaction buserr = {
175
- .handler = no_action,
176
- .flags = IRQF_NO_THREAD,
177
- .name = "Bus Error",
178
-};
179
-
180
-static struct irqaction map0_cascade = {
181
- .handler = no_action,
182
- .flags = IRQF_NO_THREAD,
183
- .name = "mapable0 cascade",
184
-};
185
-
186162 #ifdef USE_LIO3_IRQ
187
-static struct irqaction map1_cascade = {
188
- .handler = no_action,
189
- .flags = IRQF_NO_THREAD,
190
- .name = "mapable1 cascade",
191
-};
192163 #define SGI_INTERRUPTS SGINT_END
193164 #else
194165 #define SGI_INTERRUPTS SGINT_LOCAL3
....@@ -322,14 +293,24 @@
322293 }
323294
324295 /* vector handler. this register the IRQ as non-sharable */
325
- setup_irq(SGI_LOCAL_0_IRQ, &local0_cascade);
326
- setup_irq(SGI_LOCAL_1_IRQ, &local1_cascade);
327
- setup_irq(SGI_BUSERR_IRQ, &buserr);
296
+ if (request_irq(SGI_LOCAL_0_IRQ, no_action, IRQF_NO_THREAD,
297
+ "local0 cascade", NULL))
298
+ pr_err("Failed to register local0 cascade interrupt\n");
299
+ if (request_irq(SGI_LOCAL_1_IRQ, no_action, IRQF_NO_THREAD,
300
+ "local1 cascade", NULL))
301
+ pr_err("Failed to register local1 cascade interrupt\n");
302
+ if (request_irq(SGI_BUSERR_IRQ, no_action, IRQF_NO_THREAD,
303
+ "Bus Error", NULL))
304
+ pr_err("Failed to register Bus Error interrupt\n");
328305
329306 /* cascade in cascade. i love Indy ;-) */
330
- setup_irq(SGI_MAP_0_IRQ, &map0_cascade);
307
+ if (request_irq(SGI_MAP_0_IRQ, no_action, IRQF_NO_THREAD,
308
+ "mapable0 cascade", NULL))
309
+ pr_err("Failed to register mapable0 cascade interrupt\n");
331310 #ifdef USE_LIO3_IRQ
332
- setup_irq(SGI_MAP_1_IRQ, &map1_cascade);
311
+ if (request_irq(SGI_MAP_1_IRQ, no_action, IRQF_NO_THREAD,
312
+ "mapable1 cascade", NULL))
313
+ pr_err("Failed to register mapable1 cascade interrupt\n");
333314 #endif
334315
335316 #ifdef CONFIG_EISA