summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/ises.c6
-rw-r--r--sys/dev/pci/lofn.c6
-rw-r--r--sys/dev/pci/noct.c8
-rw-r--r--sys/dev/pci/nofn.c6
-rw-r--r--sys/dev/pci/safe.c4
-rw-r--r--sys/dev/pci/ubsec.c20
6 files changed, 25 insertions, 25 deletions
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);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-14 23:35:05 +0000