Make PCI interrupt handlers return void like everybody else does.

Reviewed by:	davidg

3 files changed, 14 insertions, 23 deletions

diff --git a/sys/i386/eisa/aic7770.c b/sys/i386/eisa/aic7770.c
index 088b4b5..b7da311 100644
--- a/sys/i386/eisa/aic7770.c
+++ b/sys/i386/eisa/aic7770.c
@@ -19,7 +19,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7770.c,v 1.20 1995/12/14 23:23:48 bde Exp $
+ *	$Id: aic7770.c,v 1.21 1996/01/03 06:28:00 gibbs Exp $
  */
 
 #include "eisa.h"
@@ -188,7 +188,7 @@ aic7770_attach(e_dev)
 	 * The IRQMS bit enables level sensitive interrupts only allow
 	 * IRQ sharing if its set.
 	 */
-	if(eisa_reg_intr(e_dev, irq, ahc_eisa_intr, (void *)ahc, &bio_imask,
+	if(eisa_reg_intr(e_dev, irq, ahc_intr, (void *)ahc, &bio_imask,
 			 /*shared ==*/ahc->pause & IRQMS)) {
 		ahc_free(ahc);
 		return -1;
@@ -307,7 +307,7 @@ aic7770_attach(e_dev)
 		 * The board's IRQ line is not yet enabled so its safe
 		 * to release the irq.
 		 */
-		eisa_release_intr(e_dev, irq, ahc_eisa_intr);
+		eisa_release_intr(e_dev, irq, ahc_intr);
 		return -1;
 	}
 
@@ -321,7 +321,7 @@ aic7770_attach(e_dev)
 	 */
 	if(eisa_enable_intr(e_dev, irq)) {
 		ahc_free(ahc);
-		eisa_release_intr(e_dev, irq, ahc_eisa_intr);
+		eisa_release_intr(e_dev, irq, ahc_intr);
 		return -1;
 	}
 
diff --git a/sys/i386/scsi/aic7xxx.c b/sys/i386/scsi/aic7xxx.c
index 4f74956..2832197 100644
--- a/sys/i386/scsi/aic7xxx.c
+++ b/sys/i386/scsi/aic7xxx.c
@@ -24,7 +24,7 @@
  *
  * commenced: Sun Sep 27 18:14:01 PDT 1992
  *
- *      $Id: aic7xxx.c,v 1.52 1996/01/05 16:13:44 gibbs Exp $
+ *      $Id: aic7xxx.c,v 1.53 1996/01/07 19:24:31 gibbs Exp $
  */
 /*
  * TODO:
@@ -497,8 +497,8 @@ void ahc_add_waiting_scb (iobase, scb, where)
 /*
  * Catch an interrupt from the adaptor
  */
-int
-ahcintr(arg)
+void
+ahc_intr(arg)
         void *arg;
 {
 	int     intstat;
@@ -515,7 +515,7 @@ ahcintr(arg)
 	 * someone who is sharing my interrupt
 	 */
 	if (!(intstat & INT_PEND))
-		return 0;
+		return;
 
         if (intstat & BRKADRINT) {
 		/* We upset the sequencer :-( */
@@ -811,7 +811,7 @@ ahcintr(arg)
 			   */
 			  outb(RETURN_1 + iobase, 0);
 		 	  if (!scb || !(scb->flags & SCB_ACTIVE)) {
-                              printf("ahc%d:%c:%d: ahcintr - referenced scb "
+                              printf("ahc%d:%c:%d: ahc_intr - referenced scb "
 				     "not valid during seqint 0x%x scb(%d)\n", 
 				     ahc->unit, channel, target, intstat,
 				     scb_index);
@@ -1012,7 +1012,7 @@ ahcintr(arg)
 				outb(MSG_LEN + iobase, 1);
 			}
 			else
-				panic("ahcintr: AWAITING_MSG for an SCB that"
+				panic("ahc_intr: AWAITING_MSG for an SCB that"
 					"does not have a waiting message");
 			break;
 		  }
@@ -1052,7 +1052,7 @@ ahcintr(arg)
 #endif
 			}
 			else
-				panic("ahcintr: Immediate complete for "
+				panic("ahc_intr: Immediate complete for "
 				      "unknown operation.");
 			break;
 		  }
@@ -1092,7 +1092,7 @@ clear:
 
                 scb = ahc->scbarray[scb_index];
                 if (!scb || !(scb->flags & SCB_ACTIVE)) {
-			printf("ahc%d: ahcintr - referenced scb not "
+			printf("ahc%d: ahc_intr - referenced scb not "
 			       "valid during scsiint 0x%x scb(%d)\n",
 				ahc->unit, status, scb_index);
                         outb(CLRSINT1 + iobase, status);
@@ -1234,14 +1234,6 @@ cmdcomplete:
 
                 } while (inb(QOUTCNT + iobase));
         }
-	return 1;
-}
-
-void
-ahc_eisa_intr(arg)
-	void *arg;
-{
-	ahcintr(arg);
 }
 
 /*
diff --git a/sys/i386/scsi/aic7xxx.h b/sys/i386/scsi/aic7xxx.h
index c5a36ec..9b3dc2e 100644
--- a/sys/i386/scsi/aic7xxx.h
+++ b/sys/i386/scsi/aic7xxx.h
@@ -20,7 +20,7 @@
  * 4. Modifications may be freely made to this file if the above conditions
  *    are met.
  *
- *	$Id: aic7xxx.h,v 1.17 1996/01/03 06:32:12 gibbs Exp $
+ *	$Id: aic7xxx.h,v 1.18 1996/01/07 19:24:33 gibbs Exp $
  */
 
 #ifndef _AIC7XXX_H_
@@ -206,7 +206,6 @@ struct ahc_data *ahc_alloc __P((int unit, u_long io_base, ahc_type type, ahc_fla
 void ahc_free __P((struct ahc_data *));
 int ahc_init __P((struct ahc_data *));
 int ahc_attach __P((struct ahc_data *));
-void ahc_eisa_intr __P((void *arg));
-int ahcintr __P((void *arg));
+void ahc_intr __P((void *arg));
 
 #endif  /* _AIC7XXX_H_ */