[parisc-linux-cvs] irqreturn_t fixes

[Helge Deller]

--Boundary-00=_tjb2+Me60czqKKM
Content-Type: text/plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

> Modified files:
> 	drivers/input/keyboard: hilkbd.c
> 	drivers/parisc : eisa.c iosapic.c superio.c
> 	drivers/parport: parport_gsc.c
>
> Log message:
> irqreturn_t fixes


--Boundary-00=_tjb2+Me60czqKKM
Content-Type: text/plain;
  charset="iso-8859-15";
  name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="diff"

Index: drivers/input/keyboard/hilkbd.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/input/keyboard/hilkbd.c,v
retrieving revision 1.3
diff -u -p -r1.3 hilkbd.c
--- drivers/input/keyboard/hilkbd.c	29 May 2003 21:12:58 -0000	1.3
+++ drivers/input/keyboard/hilkbd.c	1 Jun 2003 08:24:38 -0000
@@ -275,7 +275,7 @@ hil_keyb_init(void)
 		printk(KERN_WARNING "HIL: no keyboard present.\n");
 	} else {
 		kbid = ffz(~c);
-		printk(KERN_INFO "HIL: keyboard found at id %d\n", kbid);
+		/* printk(KERN_INFO "HIL: keyboard found at id %d\n", kbid); */
 	}
 
 	/* set it to raw mode */
Index: drivers/parisc/eisa.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/parisc/eisa.c,v
retrieving revision 1.6
diff -u -p -r1.6 eisa.c
--- drivers/parisc/eisa.c	18 Feb 2003 02:53:13 -0000	1.6
+++ drivers/parisc/eisa.c	1 Jun 2003 08:24:39 -0000
@@ -213,7 +213,7 @@ static struct irq_region eisa_irq_region
 	.action	= action,
 };
 
-static void eisa_irq(int _, void *intr_dev, struct pt_regs *regs)
+static irqreturn_t eisa_irq(int _, void *intr_dev, struct pt_regs *regs)
 {
 	extern void do_irq(struct irqaction *a, int i, struct pt_regs *p);
 	int irq = gsc_readb(0xfc01f000); /* EISA supports 16 irqs */
@@ -262,11 +262,13 @@ static void eisa_irq(int _, void *intr_d
 		eisa_out8(master_mask, 0x21);
 	}
 	spin_unlock_irqrestore(&eisa_irq_lock, flags);
+	return IRQ_HANDLED;
 }
 
-static void dummy_irq2_handler(int _, void *dev, struct pt_regs *regs)
+static irqreturn_t dummy_irq2_handler(int _, void *dev, struct pt_regs *regs)
 {
 	printk(KERN_ALERT "eisa: uhh, irq2?\n");
+	return IRQ_HANDLED;
 }
 
 static void init_eisa_pic(void)
Index: drivers/parisc/iosapic.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/parisc/iosapic.c,v
retrieving revision 1.5
diff -u -p -r1.5 iosapic.c
--- drivers/parisc/iosapic.c	29 Nov 2002 17:10:32 -0000	1.5
+++ drivers/parisc/iosapic.c	1 Jun 2003 08:24:41 -0000
@@ -605,7 +605,7 @@ iosapic_xlate_pin(struct iosapic_info *i
 }
 
 
-static void
+static irqreturn_t
 iosapic_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 {
 	struct vector_info *vi = (struct vector_info *)dev_id;
@@ -623,6 +623,8 @@ iosapic_interrupt(int irq, void *dev_id,
 	** I/O SAPIC must always issue EOI.
 	*/
 	IOSAPIC_EOI(vi->vi_eoi_addr, vi->vi_eoi_data);
+
+	return IRQ_HANDLED;
 }
 
 
Index: drivers/parisc/superio.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/parisc/superio.c,v
retrieving revision 1.7
diff -u -p -r1.7 superio.c
--- drivers/parisc/superio.c	17 Dec 2002 19:53:29 -0000	1.7
+++ drivers/parisc/superio.c	1 Jun 2003 08:24:42 -0000
@@ -90,7 +90,7 @@ superio_inform_irq(int irq)
     sio_dev.iosapic_irq = irq;
 }
 
-static void
+static irqreturn_t
 superio_interrupt(int irq, void *devp, struct pt_regs *regs)
 {
 	struct superio_device *sio = (struct superio_device *)devp;
@@ -107,7 +107,7 @@ superio_interrupt(int irq, void *devp, s
 		/* HACK: need to investigate why this happens if SMP enabled */
 		BUG(); /* This shouldn't happen */
 #endif
-		return;
+		return IRQ_HANDLED;
 	}
 
 	/* Check to see which device is interrupting */
@@ -117,7 +117,7 @@ superio_interrupt(int irq, void *devp, s
 	if (local_irq == 2 || local_irq > 7) {
 		printk(KERN_ERR "SuperIO: slave interrupted!\n");
 		BUG();
-		return;
+		return IRQ_HANDLED;
 	}
 
 	if (local_irq == 7) {
@@ -128,7 +128,7 @@ superio_interrupt(int irq, void *devp, s
 		results = inb(IC_PIC1+0);
 		if ((results & 0x80) == 0) { /* if ISR7 not set: spurious */
 			printk(KERN_WARNING "SuperIO: spurious interrupt!\n");
-			return;
+			return IRQ_HANDLED;
 		}
 	}
 
@@ -141,7 +141,7 @@ superio_interrupt(int irq, void *devp, s
 	/* set EOI */
 
 	outb((OCW2_SEOI|local_irq),IC_PIC1 + 0);
-	return;
+	return IRQ_HANDLED;
 }
 
 /* Initialize Super I/O device */
Index: drivers/parport/parport_gsc.c
===================================================================
RCS file: /var/cvs/linux-2.5/drivers/parport/parport_gsc.c,v
retrieving revision 1.7
diff -u -p -r1.7 parport_gsc.c
--- drivers/parport/parport_gsc.c	25 Mar 2003 03:18:45 -0000	1.7
+++ drivers/parport/parport_gsc.c	1 Jun 2003 08:24:42 -0000
@@ -81,9 +81,10 @@ static int clear_epp_timeout(struct parp
  * of these are in parport_gsc.h.
  */
 
-static void parport_gsc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t parport_gsc_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 {
 	parport_generic_irq(irq, (struct parport *) dev_id, regs);
+	return IRQ_HANDLED;
 }
 
 void parport_gsc_write_data(struct parport *p, unsigned char d)

--Boundary-00=_tjb2+Me60czqKKM--