Commit 43bb7692 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] irqs: watchdog drivers

Update the watchdog drivers to the new IRQ API.

Also, give a couple of irq handlers static scope.
parent c542ad7c
...@@ -187,7 +187,7 @@ static void eurwdt_activate_timer(void) ...@@ -187,7 +187,7 @@ static void eurwdt_activate_timer(void)
* Kernel methods. * Kernel methods.
*/ */
void eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
printk(KERN_CRIT "timeout WDT timeout\n"); printk(KERN_CRIT "timeout WDT timeout\n");
...@@ -197,6 +197,7 @@ void eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -197,6 +197,7 @@ void eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
printk(KERN_CRIT "Initiating system reboot.\n"); printk(KERN_CRIT "Initiating system reboot.\n");
machine_restart(NULL); machine_restart(NULL);
#endif #endif
return IRQ_HANDLED;
} }
......
...@@ -178,7 +178,7 @@ static int wdt_status(void) ...@@ -178,7 +178,7 @@ static int wdt_status(void)
* a failure condition occurring. * a failure condition occurring.
*/ */
void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
/* /*
* Read the status register see what is up and * Read the status register see what is up and
...@@ -210,7 +210,8 @@ void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -210,7 +210,8 @@ void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
#endif #endif
#else #else
printk(KERN_CRIT "Reset in 5ms.\n"); printk(KERN_CRIT "Reset in 5ms.\n");
#endif #endif
return IRQ_HANDLED;
} }
......
...@@ -161,7 +161,7 @@ static int wdtpci_status(void) ...@@ -161,7 +161,7 @@ static int wdtpci_status(void)
* a failure condition occurring. * a failure condition occurring.
*/ */
static void wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs) static irqreturn_t wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
{ {
/* /*
* Read the status register see what is up and * Read the status register see what is up and
...@@ -193,7 +193,8 @@ static void wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -193,7 +193,8 @@ static void wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
#endif #endif
#else #else
printk(KERN_CRIT "Reset in 5ms.\n"); printk(KERN_CRIT "Reset in 5ms.\n");
#endif #endif
return IRQ_HANDLED;
} }
......
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