 @@ -1,14 +1,14 @@
-/*	$NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $	*/
+/*	$NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $	*/
 /*-
  * Copyright (c) 2000, 2001, 2002, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * Support for I2O IOPs (intelligent I/O processors).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.83 2013/09/14 13:08:31 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iop.c,v 1.84 2013/10/17 21:16:12 christos Exp $");
 #include "iop.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/malloc.h>
 #include <sys/ioctl.h>
 #include <sys/endian.h>
 #include <sys/conf.h>
 @@ -597,34 +597,32 @@ iop_config_interrupts(device_t self)
 		aprint_error_dev(sc->sc_dev, "unable to create reconfiguration thread (%d)", rv);
  		return;
+ 	}
+}
 /*
  * Reconfiguration thread; listens for LCT change notification, and
  * initiates re-configuration if received.
  */
 static void
 iop_reconf_thread(void *cookie)
+{
 	struct iop_softc *sc;
 	struct lwp *l;
 	struct i2o_lct lct;
 	u_int32_t chgind;
 	int rv;
 	sc = cookie;
 	chgind = sc->sc_chgind + 1;
 	l = curlwp;
 	for (;;) {
 		DPRINTF(("%s: async reconfig: requested 0x%08x\n",
 		    device_xname(sc->sc_dev), chgind));
 		rv = iop_lct_get0(sc, &lct, sizeof(lct), chgind);
 		DPRINTF(("%s: async reconfig: notified (0x%08x, %d)\n",
 		    device_xname(sc->sc_dev), le32toh(lct.changeindicator), rv));
 		mutex_enter(&sc->sc_conflock);
 		if (rv == 0) {
 			iop_reconfigure(sc, le32toh(lct.changeindicator));
 @@ -2229,31 +2227,33 @@ iop_msg_wait(struct iop_softc *sc, struc
 	mutex_spin_enter(&sc->sc_intrlock);
 	if ((im->im_flags & IM_REPLIED) != 0) {
 		mutex_spin_exit(&sc->sc_intrlock);
 		return;
+	}
 	rv = cv_timedwait(&im->im_cv, &sc->sc_intrlock, mstohz(timo));
 	mutex_spin_exit(&sc->sc_intrlock);
 #ifdef I2ODEBUG
 	if (rv != 0) {
 		printf("iop_msg_wait: tsleep() == %d\n", rv);
 		if (iop_status_get(sc, 0) != 0)
-			printf("iop_msg_wait: unable to retrieve status\n");
+			printf("%s: unable to retrieve status\n", __func__);
 		else
-			printf("iop_msg_wait: IOP state = %d\n",
+			printf("%s: IOP state = %d\n", __func__,
 			    (le32toh(sc->sc_status.segnumber) >> 16) & 0xff);
+	}
 #else
 	__USE(rv);
 #endif
+}
 /*
  * Release an unused message frame back to the IOP's inbound fifo.
  */
 static void
 iop_release_mfa(struct iop_softc *sc, u_int32_t mfa)
+{
 	/* Use the frame to issue a no-op. */
 	iop_outl_msg(sc, mfa, I2O_VERSION_11 | (4 << 16));
 	iop_outl_msg(sc, mfa + 4, I2O_MSGFUNC(I2O_TID_IOP, I2O_UTIL_NOP));