Remove useless ``elm'' argument from the SIMPLEQ_REMOVE_HEAD macro.

This matches our SLIST behaviour and NetBSD's SIMPLEQ as well.

ok millert krw deraadt

22 files changed, 67 insertions, 67 deletions

diff --git a/sys/arch/sparc/dev/ts102.c b/sys/arch/sparc/dev/ts102.c
index f515beca0a5..d779c35d888 100644
--- a/sys/arch/sparc/dev/ts102.c
+++ b/sys/arch/sparc/dev/ts102.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ts102.c,v 1.10 2003/07/02 21:32:48 todd Exp $	*/
+/*	$OpenBSD: ts102.c,v 1.11 2004/05/04 16:59:31 grange Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  *
@@ -631,7 +631,7 @@ tslot_event_thread(void *v)
 			continue;
 		}
 
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_events, te, te_q);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_events, te_q);
 		splx(s);
 
 		if (te->te_slot >= TS102_NUM_SLOTS) {
diff --git a/sys/arch/vax/qbus/uba.c b/sys/arch/vax/qbus/uba.c
index 30c1554d72e..e426ea931be 100644
--- a/sys/arch/vax/qbus/uba.c
+++ b/sys/arch/vax/qbus/uba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uba.c,v 1.8 2003/06/02 23:27:58 millert Exp $	*/
+/*	$OpenBSD: uba.c,v 1.9 2004/05/04 16:59:31 grange Exp $	*/
 /*	$NetBSD: uba.c,v 1.57 2001/04/26 19:16:07 ragge Exp $	*/
 /*
  * Copyright (c) 1996 Jonathan Stone.
@@ -93,7 +93,7 @@ uba_done(struct uba_softc *uh)
 	struct uba_unit *uu;
  
 	while ((uu = SIMPLEQ_FIRST(&uh->uh_resq))) {
-		SIMPLEQ_REMOVE_HEAD(&uh->uh_resq, uu, uu_resq);
+		SIMPLEQ_REMOVE_HEAD(&uh->uh_resq, uu_resq);
 		if ((*uu->uu_ready)(uu) == 0) {
 			SIMPLEQ_INSERT_HEAD(&uh->uh_resq, uu, uu_resq);
 			break;
diff --git a/sys/arch/vax/uba/uba.c b/sys/arch/vax/uba/uba.c
index f2787d336ae..05db6016877 100644
--- a/sys/arch/vax/uba/uba.c
+++ b/sys/arch/vax/uba/uba.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uba.c,v 1.18 2003/11/10 21:05:06 miod Exp $	   */
+/*	$OpenBSD: uba.c,v 1.19 2004/05/04 16:59:31 grange Exp $	   */
 /*	$NetBSD: uba.c,v 1.43 2000/01/24 02:40:36 matt Exp $	   */
 /*
  * Copyright (c) 1996 Jonathan Stone.
@@ -712,7 +712,7 @@ ubarelse(uh, amr)
 		wakeup((caddr_t)&uh->uh_mrwant);
 	}
 	while ((uu = uh->uh_resq.sqh_first)) {
-		SIMPLEQ_REMOVE_HEAD(&uh->uh_resq, uu, uu_resq);
+		SIMPLEQ_REMOVE_HEAD(&uh->uh_resq, uu_resq);
 		if ((*uu->uu_ready)(uu) == 0)
 			break;
 	}
diff --git a/sys/arch/vax/vsa/vsbus.c b/sys/arch/vax/vsa/vsbus.c
index 71f184cd487..9b9dafe2aa6 100644
--- a/sys/arch/vax/vsa/vsbus.c
+++ b/sys/arch/vax/vsa/vsbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vsbus.c,v 1.13 2003/11/10 21:05:06 miod Exp $ */
+/*	$OpenBSD: vsbus.c,v 1.14 2004/05/04 16:59:31 grange Exp $ */
 /*	$NetBSD: vsbus.c,v 1.29 2000/06/29 07:14:37 mrg Exp $ */
 /*
  * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
@@ -409,7 +409,7 @@ vsbus_dma_intr(void)
 		return;
 	}
 	vsbus_active = 1;
-	SIMPLEQ_REMOVE_HEAD(&vsbus_dma, vd, vd_q);
+	SIMPLEQ_REMOVE_HEAD(&vsbus_dma, vd_q);
 	(*vd->vd_go)(vd->vd_arg);
 }
 
diff --git a/sys/dev/cardbus/cardbus.c b/sys/dev/cardbus/cardbus.c
index 123ff3b5fc3..88bf36491bb 100644
--- a/sys/dev/cardbus/cardbus.c
+++ b/sys/dev/cardbus/cardbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardbus.c,v 1.9 2004/01/26 19:12:52 fgsch Exp $ */
+/*	$OpenBSD: cardbus.c,v 1.10 2004/05/04 16:59:31 grange Exp $ */
 /*	$NetBSD: cardbus.c,v 1.24 2000/04/02 19:11:37 mycroft Exp $	*/
 
 /*
@@ -253,7 +253,7 @@ cardbus_read_tuples(ca, cis_ptr, tuples, len)
 		break;
 	    }
 	    while((p = SIMPLEQ_FIRST(&rom_image)) != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&rom_image, p, next);
+		SIMPLEQ_REMOVE_HEAD(&rom_image, next);
 		free(p, M_DEVBUF);
 	    }
 	out:
diff --git a/sys/dev/cardbus/cardslot.c b/sys/dev/cardbus/cardslot.c
index b315e63f602..5516e39db41 100644
--- a/sys/dev/cardbus/cardslot.c
+++ b/sys/dev/cardbus/cardslot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cardslot.c,v 1.3 2003/10/21 10:07:33 jmc Exp $ */
+/*	$OpenBSD: cardslot.c,v 1.4 2004/05/04 16:59:31 grange Exp $ */
 /*	$NetBSD: cardslot.c,v 1.9 2000/03/22 09:35:06 haya Exp $	*/
 
 /*
@@ -314,7 +314,7 @@ cardslot_event_thread(arg)
       (void) tsleep(&sc->sc_events, PWAIT, "cardslotev", 0);
       continue;
     }
-    SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce, ce_q);
+    SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q);
     splx(s);
 
     if (IS_CARDSLOT_INSERT_REMOVE_EV(ce->ce_type)) {
@@ -333,9 +333,9 @@ cardslot_event_thread(arg)
 	  break;
 	}
 	if (ce2->ce_type == ce->ce_type) {
-	  SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce1, ce_q);
+	  SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q);
 	  free(ce1, M_TEMP);
-	  SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce2, ce_q);
+	  SIMPLEQ_REMOVE_HEAD(&sc->sc_events, ce_q);
 	  free(ce2, M_TEMP);
 	}
       }
diff --git a/sys/dev/ic/cac.c b/sys/dev/ic/cac.c
index dbbf361fdd5..dd5948d92d9 100644
--- a/sys/dev/ic/cac.c
+++ b/sys/dev/ic/cac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cac.c,v 1.17 2004/01/09 21:32:23 brad Exp $	*/
+/*	$OpenBSD: cac.c,v 1.18 2004/05/04 16:59:31 grange Exp $	*/
 /*	$NetBSD: cac.c,v 1.15 2000/11/08 19:20:35 ad Exp $	*/
 
 /*
@@ -423,7 +423,7 @@ cac_ccb_start(struct cac_softc *sc, struct cac_ccb *ccb)
 
 	while ((ccb = SIMPLEQ_FIRST(&sc->sc_ccb_queue)) != NULL &&
 	    !(*sc->sc_cl->cl_fifo_full)(sc)) {
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_ccb_queue, ccb, ccb_chain);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_ccb_queue, ccb_chain);
 		ccb->ccb_flags |= CAC_CCB_ACTIVE;
 		(*sc->sc_cl->cl_submit)(sc, ccb);
 	}
@@ -489,7 +489,7 @@ cac_ccb_alloc(struct cac_softc *sc, int nosleep)
 	struct cac_ccb *ccb;
 
 	if ((ccb = SIMPLEQ_FIRST(&sc->sc_ccb_free)) != NULL)
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_ccb_free, ccb, ccb_chain);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_ccb_free, ccb_chain);
 	else
 		ccb = NULL;
 	return (ccb);
diff --git a/sys/dev/ic/i82365.c b/sys/dev/ic/i82365.c
index 0c9157edfec..462c0a7c2d9 100644
--- a/sys/dev/ic/i82365.c
+++ b/sys/dev/ic/i82365.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82365.c,v 1.22 2002/03/14 01:26:54 millert Exp $	*/
+/*	$OpenBSD: i82365.c,v 1.23 2004/05/04 16:59:31 grange Exp $	*/
 /*	$NetBSD: i82365.c,v 1.10 1998/06/09 07:36:55 thorpej Exp $	*/
 
 /*
@@ -453,7 +453,7 @@ pcic_event_process(h, pe)
 	int s;
 
 	s = splhigh();
-	SIMPLEQ_REMOVE_HEAD(&h->events, pe, pe_q);
+	SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 	splx(s);
 
 	switch (pe->pe_type) {
@@ -469,9 +469,9 @@ pcic_event_process(h, pe)
 			if ((pe2 = SIMPLEQ_NEXT(pe1, pe_q)) == NULL)
 				break;
 			if (pe2->pe_type == PCIC_EVENT_INSERTION) {
-				SIMPLEQ_REMOVE_HEAD(&h->events, pe1, pe_q);
+				SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 				free(pe1, M_TEMP);
-				SIMPLEQ_REMOVE_HEAD(&h->events, pe2, pe_q);
+				SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 				free(pe2, M_TEMP);
 			}
 		}
@@ -493,9 +493,9 @@ pcic_event_process(h, pe)
 			if ((pe2 = SIMPLEQ_NEXT(pe1, pe_q)) == NULL)
 				break;
 			if (pe2->pe_type == PCIC_EVENT_REMOVAL) {
-				SIMPLEQ_REMOVE_HEAD(&h->events, pe1, pe_q);
+				SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 				free(pe1, M_TEMP);
-				SIMPLEQ_REMOVE_HEAD(&h->events, pe2, pe_q);
+				SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 				free(pe2, M_TEMP);
 			}
 		}
diff --git a/sys/dev/ic/tcic2.c b/sys/dev/ic/tcic2.c
index e412ec5e76e..41dfeaed7b0 100644
--- a/sys/dev/ic/tcic2.c
+++ b/sys/dev/ic/tcic2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tcic2.c,v 1.4 2003/10/21 18:58:49 jmc Exp $	*/
+/*	$OpenBSD: tcic2.c,v 1.5 2004/05/04 16:59:31 grange Exp $	*/
 /*	$NetBSD: tcic2.c,v 1.3 2000/01/13 09:38:17 joda Exp $	*/
 
 #undef	TCICDEBUG
@@ -482,7 +482,7 @@ tcic_event_thread(arg)
 			(void) tsleep(&h->events, PWAIT, "tcicev", 0);
 			continue;
 		}
-		SIMPLEQ_REMOVE_HEAD(&h->events, pe, pe_q);
+		SIMPLEQ_REMOVE_HEAD(&h->events, pe_q);
 		splx(s);
 
 		switch (pe->pe_type) {
diff --git a/sys/dev/pci/ises.c b/sys/dev/pci/ises.c
index caf85c3ccc3..40cb6f8d7f1 100644
--- a/sys/dev/pci/ises.c
+++ b/sys/dev/pci/ises.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ises.c,v 1.24 2003/06/07 11:31:24 ho Exp $	*/
+/*	$OpenBSD: ises.c,v 1.25 2004/05/04 16:59:31 grange Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001 Håkan Olsson (ho@crt.se)
@@ -608,7 +608,7 @@ ises_process_oqueue(struct ises_softc *sc)
 		s = splnet();
 		if (!SIMPLEQ_EMPTY(&sc->sc_cmdq)) {
 			cq = SIMPLEQ_FIRST(&sc->sc_cmdq);
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_cmdq, cq, cmd_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_cmdq, cmd_next);
 			cq->cmd_rlen = len;
 		} else {
 			cq = NULL;
@@ -882,7 +882,7 @@ ises_feed(struct ises_softc *sc)
 	DELAY(2000000);
 
 	s = splnet();
-	SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q, q_next);
+	SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 	SIMPLEQ_INSERT_TAIL(&sc->sc_qchip, q, q_next);
 	--sc->sc_nqueue;
 	splx(s);
diff --git a/sys/dev/pci/lofn.c b/sys/dev/pci/lofn.c
index 1c16016e4fd..f5369cea03d 100644
--- a/sys/dev/pci/lofn.c
+++ b/sys/dev/pci/lofn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lofn.c,v 1.25 2004/02/03 17:17:33 deraadt Exp $	*/
+/*	$OpenBSD: lofn.c,v 1.26 2004/05/04 16:59:31 grange Exp $	*/
 
 /*
  * Copyright (c) 2001-2002 Jason L. Wright (jason@thought.net)
@@ -546,12 +546,12 @@ lofn_feed(sc)
 		q = SIMPLEQ_FIRST(&sc->sc_queue);
 		if (q->q_start(sc, q) == 0) {
 			sc->sc_current = q;
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 			sc->sc_ier |= LOFN_IER_DONE;
 			WRITE_REG(sc, LOFN_REL_IER, sc->sc_ier);
 			break;
 		} else {
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 			free(q, M_DEVBUF);
 		}
 	}
diff --git a/sys/dev/pci/noct.c b/sys/dev/pci/noct.c
index c7b9e9df94c..64298a7a915 100644
--- a/sys/dev/pci/noct.c
+++ b/sys/dev/pci/noct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: noct.c,v 1.15 2004/02/03 17:17:33 deraadt Exp $	*/
+/*	$OpenBSD: noct.c,v 1.16 2004/05/04 16:59:31 grange Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -897,7 +897,7 @@ noct_ea_thread(vsc)
 		s = splnet();
 		while (!SIMPLEQ_EMPTY(&sc->sc_outq)) {
 			q = SIMPLEQ_FIRST(&sc->sc_outq);
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_outq, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_outq, q_next);
 			splx(s);
 
 			crp = q->q_crp;
@@ -954,7 +954,7 @@ noct_ea_thread(vsc)
 		s = splnet();
 		while (!SIMPLEQ_EMPTY(&sc->sc_inq)) {
 			q = SIMPLEQ_FIRST(&sc->sc_inq);
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_inq, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_inq, q_next);
 			splx(s);
 
 			noct_ea_start(sc, q);
@@ -1296,7 +1296,7 @@ noct_ea_intr(sc)
 		if (SIMPLEQ_EMPTY(&sc->sc_chipq))
 			panic("%s: empty chipq", sc->sc_dv.dv_xname);
 		q = SIMPLEQ_FIRST(&sc->sc_chipq);
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_chipq, q, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_chipq, q_next);
 		SIMPLEQ_INSERT_TAIL(&sc->sc_outq, q, q_next);
 
 		bus_dmamap_sync(sc->sc_dmat, sc->sc_eamap,
diff --git a/sys/dev/pci/nofn.c b/sys/dev/pci/nofn.c
index cdd60c060c5..be62e9bad12 100644
--- a/sys/dev/pci/nofn.c
+++ b/sys/dev/pci/nofn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nofn.c,v 1.11 2004/02/03 17:17:33 deraadt Exp $	*/
+/*	$OpenBSD: nofn.c,v 1.12 2004/05/04 16:59:31 grange Exp $	*/
 
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
@@ -417,7 +417,7 @@ nofn_pk_feed(sc)
 		q = SIMPLEQ_FIRST(&sc->sc_pk_queue);
 		if (q->q_start(sc, q) == 0) {
 			sc->sc_pk_current = q;
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_pk_queue, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_pk_queue, q_next);
 
 			r = PK_READ_4(sc, NOFN_PK_IER);
 			r &= PK_IER_RRDY; /* preserve */
@@ -425,7 +425,7 @@ nofn_pk_feed(sc)
 			PK_WRITE_4(sc, NOFN_PK_IER, r);
 			break;
 		} else {
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_pk_queue, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_pk_queue, q_next);
 			free(q, M_DEVBUF);
 		}
 	}
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index 4fcad6ad8c1..483b44a404e 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safe.c,v 1.12 2004/02/03 17:17:33 deraadt Exp $	*/
+/*	$OpenBSD: safe.c,v 1.13 2004/05/04 16:59:31 grange Exp $	*/
 
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -1989,7 +1989,7 @@ safe_kfeed(struct safe_softc *sc)
 		struct safe_pkq *q = SIMPLEQ_FIRST(&sc->sc_pkq);
 
 		sc->sc_pkq_cur = q;
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_pkq, q, pkq_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_pkq, pkq_next);
 		if (safe_kstart(sc) != 0) {
 			crypto_kdone(q->pkq_krp);
 			free(q, M_DEVBUF);
diff --git a/sys/dev/pci/ubsec.c b/sys/dev/pci/ubsec.c
index 20b6fa57d41..ad9f7da5ba2 100644
--- a/sys/dev/pci/ubsec.c
+++ b/sys/dev/pci/ubsec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ubsec.c,v 1.133 2004/02/03 17:17:33 deraadt Exp $	*/
+/*	$OpenBSD: ubsec.c,v 1.134 2004/05/04 16:59:31 grange Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (jason@thought.net)
@@ -370,7 +370,7 @@ ubsec_intr(void *arg)
 			if ((dmap->d_dma->d_mcr.mcr_flags & htole16(UBS_MCR_DONE)) == 0)
 				break;
 
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q_next);
 
 			npkts = q->q_nstacked_mcrs;
 			/*
@@ -418,7 +418,7 @@ ubsec_intr(void *arg)
 				    BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
 				break;
 			}
-			SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip2, q2, q_next);
+			SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip2, q_next);
 			ubsec_callback2(sc, q2);
 			/*
 			 * Don't send any more packet to chip if there has been
@@ -487,7 +487,7 @@ ubsec_feed(struct ubsec_softc *sc)
 #endif /* UBSEC_DEBUG */
 
 	q = SIMPLEQ_FIRST(&sc->sc_queue);
-	SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q, q_next);
+	SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 	--sc->sc_nqueue;
 
 	bus_dmamap_sync(sc->sc_dmat, q->q_src_map,
@@ -505,7 +505,7 @@ ubsec_feed(struct ubsec_softc *sc)
 		if (q2->q_dst_map != NULL)
 			bus_dmamap_sync(sc->sc_dmat, q2->q_dst_map,
 			    0, q2->q_dst_map->dm_mapsize, BUS_DMASYNC_PREREAD);
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q2, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 		--sc->sc_nqueue;
 
 		v = ((void *)&q2->q_dma->d_dma->d_mcr) + sizeof(struct ubsec_mcr) -
@@ -550,7 +550,7 @@ feed1:
 		printf("feed: q->chip %p %08x\n", q,
 		    (u_int32_t)q->q_dma->d_alloc.dma_paddr);
 #endif /* UBSEC_DEBUG */
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue, q_next);
 		--sc->sc_nqueue;
 		SIMPLEQ_INSERT_TAIL(&sc->sc_qchip, q, q_next);
 	}
@@ -759,7 +759,7 @@ ubsec_process(struct cryptop *crp)
 	}
 
 	q = SIMPLEQ_FIRST(&sc->sc_freequeue);
-	SIMPLEQ_REMOVE_HEAD(&sc->sc_freequeue, q, q_next);
+	SIMPLEQ_REMOVE_HEAD(&sc->sc_freequeue, q_next);
 	splx(s);
 
 	dmap = q->q_dma; /* Save dma pointer */
@@ -1351,7 +1351,7 @@ ubsec_feed2(struct ubsec_softc *sc)
 		    BUS_DMASYNC_PREWRITE);
 
 		WRITE_REG(sc, BS_MCR2, q->q_mcr.dma_paddr);
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue2, q, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_queue2, q_next);
 		--sc->sc_nqueue2;
 		SIMPLEQ_INSERT_TAIL(&sc->sc_qchip2, q, q_next);
 	}
@@ -1640,7 +1640,7 @@ ubsec_cleanchip(struct ubsec_softc *sc)
 
 	while (!SIMPLEQ_EMPTY(&sc->sc_qchip)) {
 		q = SIMPLEQ_FIRST(&sc->sc_qchip);
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_qchip, q_next);
 		ubsec_free_q(sc, q);
 	}
 }
@@ -1783,7 +1783,7 @@ ubsec_kprocess(struct cryptkop *krp)
 		struct ubsec_q2 *q;
 
 		q = SIMPLEQ_FIRST(&sc->sc_q2free);
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_q2free, q, q_next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_q2free, q_next);
 		ubsec_kfree(sc, q);
 	}
 
diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c
index bce3ed227fb..951b739c12f 100644
--- a/sys/dev/usb/ohci.c
+++ b/sys/dev/usb/ohci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ohci.c,v 1.37 2004/01/26 20:10:22 deraadt Exp $ */
+/*	$OpenBSD: ohci.c,v 1.38 2004/05/04 16:59:32 grange Exp $ */
 /*	$NetBSD: ohci.c,v 1.139 2003/02/22 05:24:16 tsutsui Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $	*/
 
@@ -920,7 +920,7 @@ ohci_allocx(struct usbd_bus *bus)
 
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, xfer, next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("ohci_allocx: xfer=%p not free, 0x%08x\n", xfer,
diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c
index 1a94613e7d0..32b36c0f26e 100644
--- a/sys/dev/usb/uhci.c
+++ b/sys/dev/usb/uhci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uhci.c,v 1.30 2003/08/23 15:16:07 fgsch Exp $	*/
+/*	$OpenBSD: uhci.c,v 1.31 2004/05/04 16:59:32 grange Exp $	*/
 /*	$NetBSD: uhci.c,v 1.172 2003/02/23 04:19:26 simonb Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $	*/
 
@@ -571,7 +571,7 @@ uhci_detach(struct uhci_softc *sc, int flags)
 		xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 		if (xfer == NULL)
 			break;
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, xfer, next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 		free(xfer, M_USB);
 	}
 
@@ -629,7 +629,7 @@ uhci_allocx(struct usbd_bus *bus)
 
 	xfer = SIMPLEQ_FIRST(&sc->sc_free_xfers);
 	if (xfer != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, xfer, next);
+		SIMPLEQ_REMOVE_HEAD(&sc->sc_free_xfers, next);
 #ifdef DIAGNOSTIC
 		if (xfer->busy_free != XFER_FREE) {
 			printf("uhci_allocx: xfer=%p not free, 0x%08x\n", xfer,
diff --git a/sys/dev/usb/usb.c b/sys/dev/usb/usb.c
index 7df3e597b41..64be39aaacc 100644
--- a/sys/dev/usb/usb.c
+++ b/sys/dev/usb/usb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usb.c,v 1.26 2003/11/07 11:10:47 jmc Exp $	*/
+/*	$OpenBSD: usb.c,v 1.27 2004/05/04 16:59:32 grange Exp $	*/
 /*	$NetBSD: usb.c,v 1.77 2003/01/01 00:10:26 thorpej Exp $	*/
 
 /*
@@ -689,7 +689,7 @@ usb_get_next_event(struct usb_event *ue)
 	}
 #endif
 	*ue = ueq->ue;
-	SIMPLEQ_REMOVE_HEAD(&usb_events, ueq, next);
+	SIMPLEQ_REMOVE_HEAD(&usb_events, next);
 	free(ueq, M_USBDEV);
 	usb_nevents--;
 	return (1);
diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c
index 44c247998bf..e4ac054179b 100644
--- a/sys/dev/usb/usbdi.c
+++ b/sys/dev/usb/usbdi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: usbdi.c,v 1.23 2003/07/08 13:19:09 nate Exp $ */
+/*	$OpenBSD: usbdi.c,v 1.24 2004/05/04 16:59:32 grange Exp $ */
 /*	$NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $	*/
 
@@ -811,7 +811,7 @@ usb_transfer_complete(usbd_xfer_handle xfer)
 			       xfer, SIMPLEQ_FIRST(&pipe->queue));
 		xfer->busy_free = XFER_BUSY;
 #endif
-		SIMPLEQ_REMOVE_HEAD(&pipe->queue, xfer, next);
+		SIMPLEQ_REMOVE_HEAD(&pipe->queue, next);
 	}
 	DPRINTFN(5,("usb_transfer_complete: repeat=%d new head=%p\n",
 		    repeat, SIMPLEQ_FIRST(&pipe->queue)));
diff --git a/sys/kern/kern_kthread.c b/sys/kern/kern_kthread.c
index 27024a12974..44c85d176a3 100644
--- a/sys/kern/kern_kthread.c
+++ b/sys/kern/kern_kthread.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_kthread.c,v 1.21 2004/01/03 14:08:53 espie Exp $	*/
+/*	$OpenBSD: kern_kthread.c,v 1.22 2004/05/04 16:59:32 grange Exp $	*/
 /*	$NetBSD: kern_kthread.c,v 1.3 1998/12/22 21:21:36 kleink Exp $	*/
 
 /*-
@@ -159,7 +159,7 @@ kthread_run_deferred_queue(void)
 	struct kthread_q *kq;
 
 	while ((kq = SIMPLEQ_FIRST(&kthread_q)) != NULL) {
-		SIMPLEQ_REMOVE_HEAD(&kthread_q, kq, kq_q);
+		SIMPLEQ_REMOVE_HEAD(&kthread_q, kq_q);
 		(*kq->kq_func)(kq->kq_arg);
 		free(kq, M_TEMP);
 	}
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index 213729ca43c..e05d122b37e 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bridge.c,v 1.132 2004/04/28 02:51:58 cedric Exp $	*/
+/*	$OpenBSD: if_bridge.c,v 1.133 2004/05/04 16:59:32 grange Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -2118,7 +2118,7 @@ bridge_flushrule(struct bridge_iflist *bif)
 
 	while (!SIMPLEQ_EMPTY(&bif->bif_brlin)) {
 		p = SIMPLEQ_FIRST(&bif->bif_brlin);
-		SIMPLEQ_REMOVE_HEAD(&bif->bif_brlin, p, brl_next);
+		SIMPLEQ_REMOVE_HEAD(&bif->bif_brlin, brl_next);
 #if NPF > 0
 		pf_tag_unref(p->brl_tag);
 #endif
@@ -2126,7 +2126,7 @@ bridge_flushrule(struct bridge_iflist *bif)
 	}
 	while (!SIMPLEQ_EMPTY(&bif->bif_brlout)) {
 		p = SIMPLEQ_FIRST(&bif->bif_brlout);
-		SIMPLEQ_REMOVE_HEAD(&bif->bif_brlout, p, brl_next);
+		SIMPLEQ_REMOVE_HEAD(&bif->bif_brlout, brl_next);
 #if NPF > 0
 		pf_tag_unref(p->brl_tag);
 #endif
diff --git a/sys/sys/queue.h b/sys/sys/queue.h
index 893e2fae298..d955159e4dd 100644
--- a/sys/sys/queue.h
+++ b/sys/sys/queue.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: queue.h,v 1.25 2004/04/08 16:08:21 henning Exp $	*/
+/*	$OpenBSD: queue.h,v 1.26 2004/05/04 16:59:32 grange Exp $	*/
 /*	$NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $	*/
 
 /*
@@ -284,8 +284,8 @@ struct {								\
 	(listelm)->field.sqe_next = (elm);				\
 } while (0)
 
-#define SIMPLEQ_REMOVE_HEAD(head, elm, field) do {			\
-	if (((head)->sqh_first = (elm)->field.sqe_next) == NULL)	\
+#define SIMPLEQ_REMOVE_HEAD(head, field) do {			\
+	if (((head)->sqh_first = (head)->sqh_first->field.sqe_next) == NULL) \
 		(head)->sqh_last = &(head)->sqh_first;			\
 } while (0)