Index: cam_periph.c
===================================================================
RCS file: /home/ncvs/src/sys/cam/cam_periph.c,v
retrieving revision 1.60
diff -u -r1.60 cam_periph.c
--- cam_periph.c	1 Jul 2005 15:21:29 -0000	1.60
+++ cam_periph.c	1 Nov 2005 15:58:49 -0000
@@ -740,11 +740,11 @@
 
 	s = splsoftcam();
 	
-	while (SLIST_FIRST(&periph->ccb_list) == NULL) {
+	while (SLIST_EMPTY(&periph->ccb_list)) {
 		if (periph->immediate_priority > priority)
 			periph->immediate_priority = priority;
 		xpt_schedule(periph, priority);
-		if ((SLIST_FIRST(&periph->ccb_list) != NULL)
+		if (!SLIST_EMPTY(&periph->ccb_list)
 		 && (SLIST_FIRST(&periph->ccb_list)->pinfo.priority == priority))
 			break;
 		tsleep(&periph->ccb_list, PRIBIO, "cgticb", 0);
Index: cam_xpt.c
===================================================================
RCS file: /home/ncvs/src/sys/cam/cam_xpt.c,v
retrieving revision 1.156
diff -u -r1.156 cam_xpt.c
--- cam_xpt.c	16 Sep 2005 01:26:17 -0000	1.156
+++ cam_xpt.c	1 Nov 2005 16:11:30 -0000
@@ -1269,9 +1269,7 @@
 		 * find the passthrough driver associated with that
 		 * peripheral driver.
 		 */
-		for (periph = TAILQ_FIRST(&(*p_drv)->units); periph != NULL;
-		     periph = TAILQ_NEXT(periph, unit_links)) {
-
+		TAILQ_FOREACH(periph, &(*p_drv)->units, unit_links) {
 			if (periph->unit_number == unit) {
 				break;
 			} else if (--splbreaknum == 0) {
@@ -2776,16 +2774,14 @@
 		    struct cam_periph *start_periph,
 		    xpt_periphfunc_t *tr_func, void *arg)
 {
-	struct cam_periph *periph, *next_periph;
+	struct cam_periph *periph;
 	int retval;
 
 	retval = 1;
 
 	for (periph = (start_periph ? start_periph :
 	     TAILQ_FIRST(&(*pdrv)->units)); periph != NULL;
-	     periph = next_periph) {
-
-		next_periph = TAILQ_NEXT(periph, unit_links);
+	     periph = TAILQ_NEXT(periph, unit_links)) {
 
 		retval = tr_func(periph, arg);
 		if (retval == 0)
@@ -4949,7 +4945,7 @@
 
 	s = splcam();
 	if ((--bus->refcount == 0)
-	 && (TAILQ_FIRST(&bus->et_entries) == NULL)) {
+	 && TAILQ_EMPTY(&bus->et_entries)) {
 		TAILQ_REMOVE(&xpt_busses, bus, links);
 		bus_generation++;
 		splx(s);
@@ -5001,7 +4997,7 @@
 
 	s = splcam();
 	if ((--target->refcount == 0)
-	 && (TAILQ_FIRST(&target->ed_entries) == NULL)) {
+	 && TAILQ_EMPTY(&target->ed_entries)) {
 		TAILQ_REMOVE(&bus->et_entries, target, links);
 		bus->generation++;
 		splx(s);
@@ -6101,7 +6097,7 @@
 	TAILQ_REMOVE(&softc->request_ccbs, &done_ccb->ccb_h, periph_links.tqe);
 	done_ccb->ccb_h.status = CAM_REQ_CMP;
 	xpt_done(done_ccb);
-	if (TAILQ_FIRST(&softc->request_ccbs) == NULL) {
+	if (TAILQ_EMPTY(&softc->request_ccbs)) {
 		cam_periph_invalidate(periph);
 		cam_periph_release(periph);
 	} else {
@@ -6917,10 +6913,10 @@
 xptpassannouncefunc(struct cam_ed *device, void *arg)
 {
 	struct cam_periph *periph;
-	int i;
+	int i = 0;
 
-	for (periph = SLIST_FIRST(&device->periphs), i = 0; periph != NULL;
-	     periph = SLIST_NEXT(periph, periph_links), i++);
+	SLIST_FOREACH(periph, &device->periphs, periph_links)
+	    i++;
 
 	periph = SLIST_FIRST(&device->periphs);
 	if ((i == 1)
Index: scsi/scsi_low.c
===================================================================
RCS file: /home/ncvs/src/sys/cam/scsi/scsi_low.c,v
retrieving revision 1.24
diff -u -r1.24 scsi_low.c
--- scsi/scsi_low.c	1 Jul 2005 15:21:30 -0000	1.24
+++ scsi/scsi_low.c	1 Nov 2005 16:55:08 -0000
@@ -362,16 +362,12 @@
 	if ((cb = slp->sl_Qnexus) != NULL && cb->osdep == osdep)
 		return cb;
 
-	for (cb = TAILQ_FIRST(&slp->sl_start); cb != NULL;
-	     cb = TAILQ_NEXT(cb, ccb_chain))
-	{
+	TAILQ_FOREACH(cb, &slp->sl_start, ccb_chain) {
 		if (cb->osdep == osdep)
 			return cb;
 	}
 
-	for (cb = TAILQ_FIRST(&li->li_discq); cb != NULL;
-	     cb = TAILQ_NEXT(cb, ccb_chain))
-	{
+	TAILQ_FOREACH(cb, &li->li_discq, ccb_chain) {
 		if (cb->osdep == osdep)
 			return cb;
 	}
@@ -1827,7 +1823,7 @@
 {
 	struct targ_info *ti;
 
-	if (TAILQ_FIRST(&slp->sl_titab) == NULL)
+	if (TAILQ_EMPTY(&slp->sl_titab))
 		TAILQ_INIT(&slp->sl_titab);
 
 	ti = SCSI_LOW_MALLOC(slp->sl_targsize);
@@ -1863,27 +1859,22 @@
 	struct scsi_low_softc *slp;
 {
 	struct targ_info *ti, *tib;
-	struct lun_info *li, *nli;
+	struct lun_info *li;
 
-	for (ti = TAILQ_FIRST(&slp->sl_titab); ti; ti = tib)
-	{
-		for (li = LIST_FIRST(&ti->ti_litab); li != NULL; li = nli)
-		{
+	TAILQ_FOREACH_SAFE(ti, &slp->sl_titab, ti_chain) {
+		LIST_FOREACH_SAFE(li, &ti->ti_litab, lun_chain) {
 			if (slp->sl_funcs->scsi_low_lun_init != NULL)
 			{
 				(*slp->sl_funcs->scsi_low_lun_init)
 					(slp, ti, li, SCSI_LOW_INFO_DEALLOC);
 			}
-			nli = LIST_NEXT(li, lun_chain);
 			SCSI_LOW_FREE(li);
 		}
 
-		if (slp->sl_funcs->scsi_low_targ_init != NULL)
-		{
+		if (slp->sl_funcs->scsi_low_targ_init != NULL) {
 			(*slp->sl_funcs->scsi_low_targ_init)
 				(slp, ti, SCSI_LOW_INFO_DEALLOC);
 		}
-		tib = TAILQ_NEXT(ti, ti_chain);
 		SCSI_LOW_FREE(ti);
 	}
 }
@@ -1975,19 +1966,13 @@
 			if (cb->ccb_tc < 0)
 				goto bus_reset;
 		}
-		else for (ti = TAILQ_FIRST(&slp->sl_titab); ti != NULL;
-		          ti = TAILQ_NEXT(ti, ti_chain))
+		else TAILQ_FOREACH(ti, &slp->sl_titab, ti_chain)
 		{
 			if (ti->ti_disc == 0)
 				continue;
 
-			for (li = LIST_FIRST(&ti->ti_litab); li != NULL;
-			     li = LIST_NEXT(li, lun_chain))
-			{
-				for (cb = TAILQ_FIRST(&li->li_discq); 
-				     cb != NULL;
-				     cb = TAILQ_NEXT(cb, ccb_chain))
-				{
+			LIST_FOREACH(li, &ti->ti_litab, lun_chain) {
+				TAILQ_FOREACH(cb, &li->li_discq, ccb_chain) {
 					cb->ccb_tc -=
 						SCSI_LOW_TIMEOUT_CHECK_INTERVAL;
 					if (cb->ccb_tc < 0)
@@ -2429,17 +2414,12 @@
 	}
 #endif	/* SCSI_LOW_DIAGNOSTIC */
 
-	for (cb = TAILQ_FIRST(&slp->sl_start); cb != NULL;
-	     cb = TAILQ_NEXT(cb, ccb_chain))
-	{
+	TAILQ_FOREACH(cb, &slp->sl_start, ccb_chain) {
 		li = cb->li;
 
 		if (li->li_disc == 0)
-		{
 			goto scsi_low_cmd_start;
-		}
-		else if (li->li_nqio > 0)
-		{
+		else if (li->li_nqio > 0) {
 			if (li->li_nqio < li->li_maxnqio ||
 		            (cb->ccb_flags & (CCB_SENSE | CCB_CLEARQ)) != 0)
 				goto scsi_low_cmd_start;
@@ -2885,9 +2865,7 @@
 {
 	struct lun_info *li;
 
-	for (li = LIST_FIRST(&ti->ti_litab); li != NULL;
-	     li = LIST_NEXT(li, lun_chain))
-	{
+	LIST_FOREACH(li, &ti->ti_litab, lun_chain) {
 		scsi_low_reset_nexus_lun(slp, li, fdone);
 		li->li_state = SCSI_LOW_LUN_SLEEP;
 		li->li_maxnqio = 0;
@@ -2910,9 +2888,7 @@
 	}
 	scsi_low_calcf_target(ti);
 
-	for (li = LIST_FIRST(&ti->ti_litab); li != NULL;
-	     li = LIST_NEXT(li, lun_chain))
-	{
+	LIST_FOREACH(li, &ti->ti_litab, lun_chain) {
 		li->li_flags = 0;
 
 		li->li_diskflags = SCSI_LOW_DISK_LFLAGS;
@@ -2944,9 +2920,7 @@
 		topcb = NULL;
 	}
 
-	for (ti = TAILQ_FIRST(&slp->sl_titab); ti != NULL;
-	     ti = TAILQ_NEXT(ti, ti_chain))
-	{
+	TAILQ_FOREACH(ti, &slp->sl_titab, ti_chain) {
 		scsi_low_reset_nexus_target(slp, ti, fdone);
 		scsi_low_bus_release(slp, ti);
 		scsi_low_init_msgsys(slp, ti);
@@ -3735,9 +3709,7 @@
 	if (cb->ccb_error != 0)
 		goto bad;
 
-	for (ncb = TAILQ_FIRST(&slp->sl_start); ncb != NULL;
-	     ncb = TAILQ_NEXT(ncb, ccb_chain))
-	{
+	TAILQ_FOREACH(ncb, &slp->sl_start, ccb_chain) {
 		if (ncb->li == li)
 			goto cmd_link_start;
 	}
@@ -4474,15 +4446,13 @@
 	struct lun_info *li;
 	int fdone;
 {
-	struct slccb *cb, *ncb, *ecb;
+	struct slccb *cb, *ecb;
 
 	if (li == NULL)
 		return;
 
 	ecb = NULL;
-	for (cb = TAILQ_FIRST(&li->li_discq); cb != NULL; cb = ncb)
-	{
-		ncb = TAILQ_NEXT(cb, ccb_chain);
+	TAILQ_FOREACH(cb, &li->li_discq, ccb_chain) {
 		cb = scsi_low_revoke_ccb(slp, cb, fdone);
 		if (cb != NULL)
 		{
@@ -4806,9 +4776,7 @@
 	printf(">>>>> SCSI_LOW_INFO(0x%lx): %s\n", (u_long) slp->sl_Tnexus, s);
 	if (ti == NULL)
 	{
-		for (ti = TAILQ_FIRST(&slp->sl_titab); ti != NULL;
-		     ti = TAILQ_NEXT(ti, ti_chain))
-		{
+		TAILQ_FOREACH(ti, &slp->sl_titab, ti_chain) {
 			scsi_low_print(slp, ti);
 		}
 	}