[PATCH] irqs: watchdog drivers

Update the watchdog drivers to the new IRQ API.

Also, give a couple of irq handlers static scope.

drivers/char/watchdog/eurotechwdt.c

@@ -187,7 +187,7 @@ static void eurwdt_activate_timer(void)
  * 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");
  
@@ -197,6 +197,7 @@ void eurwdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 	printk(KERN_CRIT "Initiating system reboot.\n");
 	machine_restart(NULL);
 #endif
+	return IRQ_HANDLED;
 }
 
 

drivers/char/watchdog/wdt.c

@@ -178,7 +178,7 @@ static int wdt_status(void)
  *	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
@@ -211,6 +211,7 @@ void wdt_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 #else
 		printk(KERN_CRIT "Reset in 5ms.\n");
 #endif
+	return IRQ_HANDLED;
 }
 
 

drivers/char/watchdog/wdt_pci.c

@@ -161,7 +161,7 @@ static int wdtpci_status(void)
  *	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
@@ -194,6 +194,7 @@ static void wdtpci_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 #else
 		printk(KERN_CRIT "Reset in 5ms.\n");
 #endif
+	return IRQ_HANDLED;
 }