Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
alpha: -Werror fixes for sys_titan.c
This code corrects the usage of the request_irq() routine.
Signed-off-by: Jay Estabrook <jay.estabrook@hp.com>
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
authored by Jay Estabrook and committed by Linus Torvalds f6901e63 b1a47190
+20
-7
arch/alpha/kernel/sys_titan.c
+20
-7
arch/alpha/kernel/sys_titan.c
···
271
* Titan Family
272
*/
273
static void __init
274
titan_late_init(void)
275
{
276
/*
···
291
* all reported to the kernel as machine checks, so the handler
292
* is a nop so it can be called to count the individual events.
293
*/
294
-
request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
295
"CChip Error", NULL);
296
-
request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
297
"PChip 0 H_Error", NULL);
298
-
request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
299
"PChip 1 H_Error", NULL);
300
-
request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
301
"PChip 0 C_Error", NULL);
302
-
request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
303
"PChip 1 C_Error", NULL);
304
305
/*
···
358
* Hook a couple of extra err interrupts that the
359
* common titan code won't.
360
*/
361
-
request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
362
"NMI", NULL);
363
-
request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
364
"Temperature Warning", NULL);
365
366
/*
···
271
* Titan Family
272
*/
273
static void __init
274
+
titan_request_irq(unsigned int irq, irq_handler_t handler,
275
+
unsigned long irqflags, const char *devname,
276
+
void *dev_id)
277
+
{
278
+
int err;
279
+
err = request_irq(irq, handler, irqflags, devname, dev_id);
280
+
if (err) {
281
+
printk("titan_request_irq for IRQ %d returned %d; ignoring\n",
282
+
irq, err);
283
+
}
284
+
}
285
+
286
+
static void __init
287
titan_late_init(void)
288
{
289
/*
···
278
* all reported to the kernel as machine checks, so the handler
279
* is a nop so it can be called to count the individual events.
280
*/
281
+
titan_request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
282
"CChip Error", NULL);
283
+
titan_request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
284
"PChip 0 H_Error", NULL);
285
+
titan_request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
286
"PChip 1 H_Error", NULL);
287
+
titan_request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
288
"PChip 0 C_Error", NULL);
289
+
titan_request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
290
"PChip 1 C_Error", NULL);
291
292
/*
···
345
* Hook a couple of extra err interrupts that the
346
* common titan code won't.
347
*/
348
+
titan_request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
349
"NMI", NULL);
350
+
titan_request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
351
"Temperature Warning", NULL);
352
353
/*