4 files changed, 17 insertions, 44 deletions

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 7a8a5d3a48c2..074893a6006e 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/if_de.c
@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $Id: if_de.c,v 1.39 1995/12/07 12:47:34 davidg Exp $
+ * $Id: if_de.c,v 1.40 1995/12/14 09:53:58 phk Exp $
  *
  */
 
@@ -1423,7 +1423,7 @@ tulip_start(
     }
 }
 
-static int
+static void
 tulip_intr(
     void *arg)
 {
@@ -1467,7 +1467,6 @@ tulip_intr(
 	    }
 	}
     } while ((sc = sc->tulip_slaves) != NULL);
-    return progress;
 }
 
 /*
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 1c41cdf0b50a..ddafbef646a4 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -29,7 +29,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: if_fxp.c,v 1.7 1996/01/03 05:22:32 davidg Exp $
+ *	$Id: if_fxp.c,v 1.8 1996/01/15 10:12:41 davidg Exp $
  */
 
 /*
@@ -138,7 +138,7 @@ static inline int fxp_scb_wait	__P((struct fxp_csr *));
 static char *fxp_probe		__P((pcici_t, pcidi_t));
 static void fxp_attach		__P((pcici_t, int));
 static int fxp_shutdown		__P((struct kern_devconf *, int));
-static int fxp_intr		__P((void *));
+static void fxp_intr		__P((void *));
 static void fxp_start		__P((struct ifnet *));
 static int fxp_ioctl		__P((struct ifnet *, int, caddr_t));
 static void fxp_init		__P((struct ifnet *));
@@ -545,18 +545,16 @@ tbdinit:
  * Process interface interrupts. Returns 1 if the interrupt
  * was handled, 0 if it wasn't.
  */
-static int
+static void
 fxp_intr(arg)
 	void *arg;
 {
 	struct fxp_softc *sc = arg;
 	struct fxp_csr *csr = sc->csr;
 	struct ifnet *ifp = &sc->arpcom.ac_if;
-	int found = 0;
 	u_char statack;
 
 	while ((statack = csr->scb_statack) != 0) {
-		found = 1;
 		/*
 		 * First ACK all the interrupts in this pass.
 		 */
@@ -653,8 +651,6 @@ rcvloop:
 			}
 		}
 	}
-
-	return found;
 }
 
 /*
diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
index c1b6873214aa..a73d9c5cc58b 100644
--- a/sys/dev/pci/pci.c
+++ b/sys/dev/pci/pci.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pci.c,v 1.39 1995/12/16 00:27:46 bde Exp $
+**  $Id: pci.c,v 1.40 1996/01/19 19:01:19 se Exp $
 **
 **  General subroutines for the PCI bus.
 **  pci_configure ()
@@ -1149,38 +1149,23 @@ static void
 pci_int (int irq)
 {
 	struct pci_int_desc * p;
-	int c, s;
-#ifdef PCI_EDGE_INT
-	int i, n;
-#endif
+	int s;
+
 	if (irq<0 || irq >= PCI_MAX_IRQ) {
 		printf ("pci_int: irq %d out of range, ignored\n", irq);
 		return;
 	};
-
-#ifdef PCI_EDGE_INT
-	for (i=0; i<1000; i++) {
-		n = 0;
-#endif
-		for (p = pci_int_desc[irq]; p!=NULL; p=p->pcid_next) {
-			s = splq (*p->pcid_maskptr);
-			c= (*p->pcid_handler) (p->pcid_argument);
-			p-> pcid_tally += c;
-			splx (s);
-#ifdef PCI_EDGE_INT
-			n += c;
-#endif
+	for (p = pci_int_desc[irq]; p!=NULL; p=p->pcid_next) {
+		s = splq (*p->pcid_maskptr);
+		(*p->pcid_handler) (p->pcid_argument);
+		p-> pcid_tally++;
+		splx (s);
 #if 0
-			if (c && p->pcid_tally<20)
+		if (p->pcid_tally<20)
 			printf ("PCI_INT: irq=%d h=%p cpl o=%x n=%x val=%d\n",
-					irq, p->pcid_handler, s, cpl, c);
+				irq, p->pcid_handler, s, cpl, c);
 #endif
-		};
-#ifdef PCI_EDGE_INT
-		if (!n) return;
 	};
-	printf ("pci_int(%d): permanent interrupt request.\n", irq);
-#endif
 }
 #endif
 
diff --git a/sys/dev/pci/pcivar.h b/sys/dev/pci/pcivar.h
index c4057715462c..50a037fe1671 100644
--- a/sys/dev/pci/pcivar.h
+++ b/sys/dev/pci/pcivar.h
@@ -1,6 +1,6 @@
 /**************************************************************************
 **
-**  $Id: pcivar.h,v 1.6 1995/05/30 08:13:12 rgrimes Exp $
+**  $Id: pcivar.h,v 1.7 1995/11/21 12:54:55 bde Exp $
 **
 **  Declarations for pci device drivers.
 **
@@ -228,17 +228,10 @@ int pci_map_port (pcici_t tag, u_long entry, u_short * pa);
 **
 **	Supports multiple handlers per irq (shared interrupts).
 **
-**	-----------------
-**
-**	There is code to support shared edge triggered ints.
-**	This relies on the cooperation of the interrupt handlers:
-**	they have to return a value <>0 if and only if something
-**	was done. Beware of the performance penalty.
-**
 **-----------------------------------------------------------------
 */
 
-typedef int pci_inthand_t(void *arg);
+typedef void pci_inthand_t(void *arg);
 
 struct pci_int_desc {
 	struct pci_int_desc * pcid_next;