patch-2.4.21 linux-2.4.21/arch/ppc/kernel/ppc8260_pic.c

• Lines: 32
• Date: 2003-06-13 07:51:31.000000000 -0700
• Orig file: linux-2.4.20/arch/ppc/kernel/ppc8260_pic.c
• Orig date: 2002-02-25 11:37:55.000000000 -0800

diff -urN linux-2.4.20/arch/ppc/kernel/ppc8260_pic.c linux-2.4.21/arch/ppc/kernel/ppc8260_pic.c
@@ -1,7 +1,3 @@
-/*
- * BK Id: SCCS/s.ppc8260_pic.c 1.5 05/17/01 18:14:21 cort
- */
-
 #include <linux/stddef.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -112,7 +108,7 @@
 	0
 };
 
-
+/* Return an interrupt vector or -1 if no interrupt is pending. */
 int
 m8260_get_irq(struct pt_regs *regs)
 {
@@ -124,11 +120,9 @@
         bits = immr->im_intctl.ic_sivec;
         irq = bits >> 26;
 
-	if (irq == 0)
-		return(-1);
-#if 0
-        irq += ppc8260_pic.irq_offset;
-#endif
+	if (irq == 0)	/* 0 --> no irq is pending */
+		irq = -1;
+
 	return irq;
 }