Skip to content

L
linux-davinci-2.6.23
Commit f6901e63 authored by Jay Estabrook's avatar Jay Estabrook Committed by Linus Torvalds
Browse files
Options

alpha: -Werror fixes for sys_titan.c 

This code corrects the usage of the request_irq() routine.
Signed-off-by: default avatarJay Estabrook <jay.estabrook@hp.com>
Signed-off-by: default avatarIvan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b1a47190
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 7 deletions
arch/alpha/kernel/sys_titan.c
View file @ f6901e63
...@@ -270,6 +270,19 @@ titan_dispatch_irqs(u64 mask) ...@@ -270,6 +270,19 @@ titan_dispatch_irqs(u64 mask)
/* /*
* Titan Family * Titan Family
*/ */
static void __init
titan_request_irq(unsigned int irq, irq_handler_t handler,
unsigned long irqflags, const char *devname,
void *dev_id)
{
int err;
err = request_irq(irq, handler, irqflags, devname, dev_id);
if (err) {
printk("titan_request_irq for IRQ %d returned %d; ignoring\n",
irq, err);
}
}
static void __init static void __init
titan_late_init(void) titan_late_init(void)
{ {
...@@ -278,15 +291,15 @@ titan_late_init(void) ...@@ -278,15 +291,15 @@ titan_late_init(void)
* all reported to the kernel as machine checks, so the handler * all reported to the kernel as machine checks, so the handler
* is a nop so it can be called to count the individual events. * is a nop so it can be called to count the individual events.
*/ */
request_irq(63+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(63+16, titan_intr_nop, IRQF_DISABLED,
"CChip Error", NULL); "CChip Error", NULL);
request_irq(62+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(62+16, titan_intr_nop, IRQF_DISABLED,
"PChip 0 H_Error", NULL); "PChip 0 H_Error", NULL);
request_irq(61+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(61+16, titan_intr_nop, IRQF_DISABLED,
"PChip 1 H_Error", NULL); "PChip 1 H_Error", NULL);
request_irq(60+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(60+16, titan_intr_nop, IRQF_DISABLED,
"PChip 0 C_Error", NULL); "PChip 0 C_Error", NULL);
request_irq(59+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(59+16, titan_intr_nop, IRQF_DISABLED,
"PChip 1 C_Error", NULL); "PChip 1 C_Error", NULL);
/* /*
...@@ -345,9 +358,9 @@ privateer_init_pci(void) ...@@ -345,9 +358,9 @@ privateer_init_pci(void)
* Hook a couple of extra err interrupts that the * Hook a couple of extra err interrupts that the
* common titan code won't. * common titan code won't.
*/ */
request_irq(53+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(53+16, titan_intr_nop, IRQF_DISABLED,
"NMI", NULL); "NMI", NULL);
request_irq(50+16, titan_intr_nop, IRQF_DISABLED, titan_request_irq(50+16, titan_intr_nop, IRQF_DISABLED,
"Temperature Warning", NULL); "Temperature Warning", NULL);
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment