Fix various glitches in queue macro usage.

ok millert@

9 files changed, 18 insertions, 20 deletions

diff --git a/sys/dev/acpi/dsdt.c b/sys/dev/acpi/dsdt.c
index 94af4eb24d7..68c6237ccd5 100644
--- a/sys/dev/acpi/dsdt.c
+++ b/sys/dev/acpi/dsdt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsdt.c,v 1.199 2013/02/09 20:56:35 miod Exp $ */
+/* $OpenBSD: dsdt.c,v 1.200 2013/04/10 01:35:55 guenther Exp $ */
 /*
  * Copyright (c) 2005 Jordan Hargrave <jordan@openbsd.org>
  *
@@ -380,7 +380,7 @@ struct aml_notify_data {
 
 SLIST_HEAD(aml_notify_head, aml_notify_data);
 struct aml_notify_head aml_notify_list =
-    LIST_HEAD_INITIALIZER(&aml_notify_list);
+    SLIST_HEAD_INITIALIZER(aml_notify_list);
 
 /*
  *  @@@: Memory management functions
diff --git a/sys/dev/ipmi.c b/sys/dev/ipmi.c
index 9a08f1726a5..e2df4a79fd9 100644
--- a/sys/dev/ipmi.c
+++ b/sys/dev/ipmi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ipmi.c,v 1.67 2012/12/21 17:30:39 gsoares Exp $ */
+/*	$OpenBSD: ipmi.c,v 1.68 2013/04/10 01:35:55 guenther Exp $ */
 
 /*
  * Copyright (c) 2005 Jordan Hargrave
@@ -139,7 +139,7 @@ long signextend(unsigned long, int);
 
 SLIST_HEAD(ipmi_sensors_head, ipmi_sensor);
 struct ipmi_sensors_head ipmi_sensor_list =
-    SLIST_HEAD_INITIALIZER(&ipmi_sensor_list);
+    SLIST_HEAD_INITIALIZER(ipmi_sensor_list);
 
 struct timeout ipmi_timeout;
 
diff --git a/sys/dev/isa/it.c b/sys/dev/isa/it.c
index ac30f772d0c..90a1801496c 100644
--- a/sys/dev/isa/it.c
+++ b/sys/dev/isa/it.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: it.c,v 1.43 2013/03/21 18:20:00 brynet Exp $	*/
+/*	$OpenBSD: it.c,v 1.44 2013/04/10 01:35:55 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007-2008 Oleg Safiullin <form@pdp-11.org.ru>
@@ -124,7 +124,7 @@ int it_fan_ext_regs[] = {
 	IT_EC_FAN_TAC4_MSB, IT_EC_FAN_TAC5_MSB
 };
 
-LIST_HEAD(, it_softc) it_softc_list = LIST_HEAD_INITIALIZER(&it_softc_list);
+LIST_HEAD(, it_softc) it_softc_list = LIST_HEAD_INITIALIZER(it_softc_list);
 
 
 int
diff --git a/sys/dev/onewire/onewire.c b/sys/dev/onewire/onewire.c
index 67103882146..745fd594c17 100644
--- a/sys/dev/onewire/onewire.c
+++ b/sys/dev/onewire/onewire.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: onewire.c,v 1.12 2011/07/03 15:47:16 matthew Exp $	*/
+/*	$OpenBSD: onewire.c,v 1.13 2013/04/10 01:35:55 guenther Exp $	*/
 
 /*
  * Copyright (c) 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -489,9 +489,7 @@ onewire_scan(struct onewire_softc *sc)
 
 out:
 	/* Detach disappeared devices */
-	for (d = TAILQ_FIRST(&sc->sc_devs);
-	    d != TAILQ_END(&sc->sc_dev); d = next) {
-		next = TAILQ_NEXT(d, d_list);
+	TAILQ_FOREACH_SAFE(d, &sc->sc_devs, d_list, next) {
 		if (!d->d_present) {
 			if (d->d_dev != NULL)
 				config_detach(d->d_dev, DETACH_FORCE);
diff --git a/sys/dev/pci/drm/drm_drv.c b/sys/dev/pci/drm/drm_drv.c
index 486b724c256..45dd52488e4 100644
--- a/sys/dev/pci/drm/drm_drv.c
+++ b/sys/dev/pci/drm/drm_drv.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: drm_drv.c,v 1.102 2013/04/03 19:57:17 kettenis Exp $ */
+/* $OpenBSD: drm_drv.c,v 1.103 2013/04/10 01:35:55 guenther Exp $ */
 /*-
  * Copyright 2007-2009 Owain G. Ainsworth <oga@openbsd.org>
  * Copyright © 2008 Intel Corporation
@@ -1699,7 +1699,7 @@ drm_gem_load_uao(bus_dma_tag_t dmat, bus_dmamap_t map, struct uvm_object *uao,
 			break;
 	}
 	/* this should be impossible */
-	if (pg != TAILQ_END(&pageq)) {
+	if (pg != TAILQ_END(&plist)) {
 		ret = EINVAL;
 		goto unwire;
 	}
diff --git a/sys/dev/pci/if_san_common.c b/sys/dev/pci/if_san_common.c
index 63f00567862..8c06b8d9883 100644
--- a/sys/dev/pci/if_san_common.c
+++ b/sys/dev/pci/if_san_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_san_common.c,v 1.14 2012/09/19 22:37:23 jsg Exp $	*/
+/*	$OpenBSD: if_san_common.c,v 1.15 2013/04/10 01:35:55 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2001-2004 Sangoma Technologies (SAN)
@@ -95,7 +95,7 @@ static int wan_ioctl_hwprobe(struct ifnet *, void *);
 
 /* private data */
 extern char	*san_drvname;
-LIST_HEAD(, sdla) wan_cardlist = LIST_HEAD_INITIALIZER(&wan_cardlist);
+LIST_HEAD(, sdla) wan_cardlist = LIST_HEAD_INITIALIZER(wan_cardlist);
 
 #if 0
 static san_detach(void)
diff --git a/sys/kern/kern_bufq.c b/sys/kern/kern_bufq.c
index 94cf222ffea..ebfde41a7af 100644
--- a/sys/kern/kern_bufq.c
+++ b/sys/kern/kern_bufq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_bufq.c,v 1.24 2013/03/18 22:13:04 tedu Exp $	*/
+/*	$OpenBSD: kern_bufq.c,v 1.25 2013/04/10 01:35:55 guenther Exp $	*/
 /*
  * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org>
  * Copyright (c) 2010 David Gwynne <dlg@openbsd.org>
@@ -28,7 +28,7 @@
 
 #include <sys/disklabel.h>
 
-SLIST_HEAD(, bufq)	bufqs = SLIST_HEAD_INITIALIZER(&bufq);
+SLIST_HEAD(, bufq)	bufqs = SLIST_HEAD_INITIALIZER(bufqs);
 struct mutex		bufqs_mtx = MUTEX_INITIALIZER(IPL_NONE);
 int			bufqs_stop;
 
diff --git a/sys/net/if_pppx.c b/sys/net/if_pppx.c
index 29ab677dd71..836a6b2b8f9 100644
--- a/sys/net/if_pppx.c
+++ b/sys/net/if_pppx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_pppx.c,v 1.17 2013/03/28 16:45:16 tedu Exp $ */
+/*	$OpenBSD: if_pppx.c,v 1.18 2013/04/10 01:35:55 guenther Exp $ */
 
 /*
  * Copyright (c) 2010 Claudio Jeker <claudio@openbsd.org>
@@ -130,7 +130,7 @@ struct pppx_dev {
 };
 
 struct rwlock			pppx_devs_lk = RWLOCK_INITIALIZER("pppxdevs");
-LIST_HEAD(, pppx_dev)		pppx_devs = LIST_HEAD_INITIALIZER(&pppx_devs);
+LIST_HEAD(, pppx_dev)		pppx_devs = LIST_HEAD_INITIALIZER(pppx_devs);
 struct pool			*pppx_if_pl;
 
 struct pppx_dev			*pppx_dev_lookup(int);
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 64166d22184..70f66f03b80 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.124 2013/04/04 17:58:42 bluhm Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.125 2013/04/10 01:35:55 guenther Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -150,7 +150,7 @@ struct icmp6_mtudisc_callback {
 };
 
 LIST_HEAD(, icmp6_mtudisc_callback) icmp6_mtudisc_callbacks =
-    LIST_HEAD_INITIALIZER(&icmp6_mtudisc_callbacks);
+    LIST_HEAD_INITIALIZER(icmp6_mtudisc_callbacks);
 
 static struct rttimer_queue *icmp6_mtudisc_timeout_q = NULL;
 extern int pmtu_expire;