 @@ -1,14 +1,14 @@
-/*	$NetBSD: scsipi_base.c,v 1.170 2016/12/16 15:00:52 mlelstv Exp $	*/
+/*	$NetBSD: scsipi_base.c,v 1.171 2016/12/18 13:59:14 mlelstv Exp $	*/
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum; by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -21,27 +21,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.170 2016/12/16 15:00:52 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.171 2016/12/18 13:59:14 mlelstv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/pool.h>
 #include <sys/errno.h>
 @@ -1452,28 +1452,28 @@ scsipi_done(struct scsipi_xfer *xs)
 	 * if we can handle it in interrupt context.
 	 */
 	if (xs->error == XS_NOERROR) {
 		mutex_exit(chan_mtx(chan));
 		(void) scsipi_complete(xs);
 		goto out;
+	}
 	/*
 	 * There is an error on this xfer.  Put it on the channel's
 	 * completion queue, and wake up the completion thread.
 	 */
 	TAILQ_INSERT_TAIL(&chan->chan_complete, xs, channel_q);
 	mutex_exit(chan_mtx(chan));
 	cv_broadcast(chan_cv_complete(chan));
 	mutex_exit(chan_mtx(chan));
  out:
 	/*
 	 * If there are more xfers on the channel's queue, attempt to
 	 * run them.
 	 */
 	scsipi_run_queue(chan);
+}
 /*
  * scsipi_complete:
+ *
  *	Completion of a scsipi_xfer.  This is the guts of scsipi_done().
 @@ -2128,88 +2128,84 @@ scsipi_execute_xs(struct scsipi_xfer *xs
  *	function, restarting the command, if necessary.
  */
 static void
 scsipi_completion_thread(void *arg)
+{
 	struct scsipi_channel *chan = arg;
 	struct scsipi_xfer *xs;
 	if (chan->chan_init_cb)
 		(*chan->chan_init_cb)(chan, chan->chan_init_cb_arg);
 	mutex_enter(chan_mtx(chan));
 	chan->chan_flags |= SCSIPI_CHAN_TACTIVE;
 	mutex_exit(chan_mtx(chan));
 	for (;;) {
 		mutex_enter(chan_mtx(chan));
 		xs = TAILQ_FIRST(&chan->chan_complete);
 		if (xs == NULL && chan->chan_tflags  == 0) {
 			/* nothing to do; wait */
 			cv_wait(chan_cv_complete(chan), chan_mtx(chan));
 			mutex_exit(chan_mtx(chan));
 			continue;
+		}
 		if (chan->chan_tflags & SCSIPI_CHANT_CALLBACK) {
 			/* call chan_callback from thread context */
 			chan->chan_tflags &= ~SCSIPI_CHANT_CALLBACK;
 			chan->chan_callback(chan, chan->chan_callback_arg);
 			mutex_exit(chan_mtx(chan));
 			continue;
+		}
 		if (chan->chan_tflags & SCSIPI_CHANT_GROWRES) {
 			/* attempt to get more openings for this channel */
 			chan->chan_tflags &= ~SCSIPI_CHANT_GROWRES;
 			mutex_exit(chan_mtx(chan));
 			scsipi_adapter_request(chan,
 			    ADAPTER_REQ_GROW_RESOURCES, NULL);
 			scsipi_channel_thaw(chan, 1);
 			if (chan->chan_tflags & SCSIPI_CHANT_GROWRES)
 				kpause("scsizzz", FALSE, hz/10, NULL);
 			mutex_enter(chan_mtx(chan));
 			continue;
+		}
 		if (chan->chan_tflags & SCSIPI_CHANT_KICK) {
 			/* explicitly run the queues for this channel */
 			chan->chan_tflags &= ~SCSIPI_CHANT_KICK;
 			mutex_exit(chan_mtx(chan));
 			scsipi_run_queue(chan);
 			mutex_enter(chan_mtx(chan));
 			continue;
+		}
 		if (chan->chan_tflags & SCSIPI_CHANT_SHUTDOWN) {
 			mutex_exit(chan_mtx(chan));
 			break;
+		}
 		if (xs) {
 			TAILQ_REMOVE(&chan->chan_complete, xs, channel_q);
 			mutex_exit(chan_mtx(chan));
 			/*
 			 * Have an xfer with an error; process it.
 			 */
 			(void) scsipi_complete(xs);
 			/*
 			 * Kick the queue; keep it running if it was stopped
 			 * for some reason.
 			 */
 			scsipi_run_queue(chan);
 		} else {
 			mutex_exit(chan_mtx(chan));
+		}
+	}
 	chan->chan_thread = NULL;
 	/* In case parent is waiting for us to exit. */
 	cv_broadcast(chan_cv_thread(chan));
 	mutex_exit(chan_mtx(chan));
 	kthread_exit(0);
+}
 /*
  * scsipi_thread_call_callback:
+ *
  * 	request to call a callback from the completion thread
  */
 int
 scsipi_thread_call_callback(struct scsipi_channel *chan,
     void (*callback)(struct scsipi_channel *, void *), void *arg)
+{