Update of /cvsroot/linux-vax/kernel-2.5/drivers/char
In directory sc8-pr-cvs1:/tmp/cvs-serv29836/drivers/char
Modified Files:
dz.c dz.h
Log Message:
Interrupt handlers need to return an irqreturn_t in 2.5.69
Index: dz.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- dz.c 28 Aug 2003 00:42:08 -0000 1.11
+++ dz.c 28 Aug 2003 21:38:02 -0000 1.12
@@ -376,7 +376,7 @@
*/
/* VAX has separate RX/TX interrupts */
#ifdef CONFIG_VAX
-static void dz_interrupt_rx (int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t dz_interrupt_rx (int irq, void *dev, struct pt_regs *regs)
{
struct dz_serial *info;
unsigned short status;
@@ -389,9 +389,10 @@
vsbus_clear_int(dz_vsbus_rx_int);
+ return IRQ_HANDLED;
}
-static void dz_interrupt_tx (int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t dz_interrupt_tx (int irq, void *dev, struct pt_regs *regs)
{
struct dz_serial *info;
unsigned short status;
@@ -404,6 +405,7 @@
vsbus_clear_int(dz_vsbus_tx_int);
+ return IRQ_HANDLED;
}
#else
static void dz_interrupt (int irq, void *dev, struct pt_regs *regs)
Index: dz.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/drivers/char/dz.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- dz.h 21 Mar 2003 00:05:55 -0000 1.4
+++ dz.h 28 Aug 2003 21:38:02 -0000 1.5
@@ -221,8 +221,8 @@
static void dz_stop (struct tty_struct *);
static void dz_start (struct tty_struct *);
#ifdef CONFIG_VAX
-static void dz_interrupt_rx (int, void *, struct pt_regs *);
-static void dz_interrupt_tx (int, void *, struct pt_regs *);
+static irqreturn_t dz_interrupt_rx (int, void *, struct pt_regs *);
+static irqreturn_t dz_interrupt_tx (int, void *, struct pt_regs *);
#else
static void dz_interrupt (int, void *, struct pt_regs *);
#endif
|
