Use queue.h macros instead of using the structure names directly.

1 files changed, 6 insertions, 8 deletions

diff --git a/sys/dev/pcmcia/pcmcia_cis.c b/sys/dev/pcmcia/pcmcia_cis.c
index 94aa293a953..fc32488cac8 100644
--- a/sys/dev/pcmcia/pcmcia_cis.c
+++ b/sys/dev/pcmcia/pcmcia_cis.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcmcia_cis.c,v 1.8 2002/06/19 19:03:25 fgsch Exp $	*/
+/*	$OpenBSD: pcmcia_cis.c,v 1.9 2002/11/19 18:36:18 jason Exp $	*/
 /*	$NetBSD: pcmcia_cis.c,v 1.9 1998/08/22 23:41:48 msaitoh Exp $	*/
 
 /*
@@ -471,8 +471,7 @@ pcmcia_print_cis(sc)
 	printf("%s: Manufacturer code 0x%x, product 0x%x\n",
 	       sc->dev.dv_xname, card->manufacturer, card->product);
 
-	for (pf = card->pf_head.sqh_first; pf != NULL;
-	    pf = pf->pf_list.sqe_next) {
+	SIMPLEQ_FOREACH(pf, &card->pf_head, pf_list) {
 		printf("%s: function %d: ", sc->dev.dv_xname, pf->number);
 
 		switch (pf->function) {
@@ -522,8 +521,7 @@ pcmcia_print_cis(sc)
 
 		printf(", ccr addr %lx mask %lx\n", pf->ccr_base, pf->ccr_mask);
 
-		for (cfe = pf->cfe_head.sqh_first; cfe != NULL;
-		    cfe = cfe->cfe_list.sqe_next) {
+		SIMPLEQ_FOREACH(cfe, &pf->cfe_head, cfe_list) {
 			printf("%s: function %d, config table entry %d: ",
 			    sc->dev.dv_xname, pf->number, cfe->number);
 
@@ -632,9 +630,9 @@ pcmcia_parse_cis_tuple(tuple, arg)
 		if (state->gotmfc == 1) {
 			struct pcmcia_function *pf, *pfnext;
 
-			for (pf = state->card->pf_head.sqh_first; pf != NULL;
-			    pf = pfnext) {
-				pfnext = pf->pf_list.sqe_next;
+			for (pf = SIMPLEQ_FIRST(&state->card->pf_head);
+			    pf != NULL; pf = pfnext) {
+				pfnext = SIMPLEQ_NEXT(pf, pf_list);
 				free(pf, M_DEVBUF);
 			}