 @@ -1,14 +1,14 @@
-/*	$NetBSD: twe.c,v 1.98 2012/12/02 15:34:36 chs Exp $	*/
+/*	$NetBSD: twe.c,v 1.99 2013/09/15 15:00:57 martin Exp $	*/
 /*-
  * Copyright (c) 2000, 2001, 2002, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran; and by Jason R. Thorpe of Wasabi Systems, Inc.
+ *
  * 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.
 @@ -53,27 +53,27 @@
  * 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.
+ *
  * from FreeBSD: twe.c,v 1.1 2000/05/24 23:35:23 msmith Exp
  */
 /*
  * Driver for the 3ware Escalade family of RAID controllers.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.98 2012/12/02 15:34:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twe.c,v 1.99 2013/09/15 15:00:57 martin Exp $");
 #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/buf.h>
 #include <sys/endian.h>
 #include <sys/malloc.h>
 #include <sys/conf.h>
 #include <sys/disk.h>
 #include <sys/sysctl.h>
 @@ -653,27 +653,26 @@ twe_del_unit(struct twe_softc *sc, int u
 	twe_recompute_openings(sc);
 	return (0);
+}
 /*
  * Reset the controller.
  * MUST BE CALLED AT splbio()!
  */
 static int
 twe_reset(struct twe_softc *sc)
+{
 	uint16_t aen;
 	u_int status;
 	volatile u_int32_t junk;
 	int got, rv;
 	/* Issue a soft reset. */
 	twe_outl(sc, TWE_REG_CTL, TWE_CTL_ISSUE_SOFT_RESET |
 	    TWE_CTL_CLEAR_HOST_INTR |
 	    TWE_CTL_CLEAR_ATTN_INTR |
 	    TWE_CTL_MASK_CMD_INTR |
 	    TWE_CTL_MASK_RESP_INTR |
 	    TWE_CTL_CLEAR_ERROR_STS |
 	    TWE_CTL_DISABLE_INTRS);
 	/* Wait for attention... */
 	if (twe_status_wait(sc, TWE_STS_ATTN_INTR, 30)) {
 @@ -721,27 +720,27 @@ twe_reset(struct twe_softc *sc)
 		    device_xname(sc->sc_dev));
 		return (-1);
+	}
 	/* Drain the response queue. */
 	for (;;) {
 		status = twe_inl(sc, TWE_REG_STS);
 		if (twe_status_check(sc, status) != 0) {
 			aprint_error_dev(sc->sc_dev, "can't drain response queue\n");
 			return (-1);
+		}
 		if ((status & TWE_STS_RESP_QUEUE_EMPTY) != 0)
 			break;
-		junk = twe_inl(sc, TWE_REG_RESP_QUEUE);
+		(void)twe_inl(sc, TWE_REG_RESP_QUEUE);
+	}
 	return (0);
+}
 /*
  * Print autoconfiguration message for a sub-device.
  */
 static int
 twe_print(void *aux, const char *pnp)
+{
 	struct twe_attach_args *twea;
 @@ -1466,36 +1465,36 @@ twe_ccb_free(struct twe_softc *sc, struc
+	}
 	ccb->ccb_flags = 0;
 	splx(s);
+}
 /*
  * Map the specified CCB's command block and data buffer (if any) into
  * controller visible space.  Perform DMA synchronisation.
  */
 int
 twe_ccb_map(struct twe_softc *sc, struct twe_ccb *ccb)
+{
 	struct twe_cmd *tc;
-	int flags, nsegs, i, s, rv, rc;
+	int flags, nsegs, i, s, rv;
 	void *data;
 	/*
 	 * The data as a whole must be 512-byte aligned.
 	 */
 	if (((u_long)ccb->ccb_data & (TWE_ALIGNMENT - 1)) != 0) {
 		s = splvm();
 		/* XXX */
-		rc = uvm_km_kmem_alloc(kmem_va_arena,
+		rv = uvm_km_kmem_alloc(kmem_va_arena,
 		    ccb->ccb_datasize, (VM_NOSLEEP | VM_INSTANTFIT),
 		    (vmem_addr_t *)&ccb->ccb_abuf);
 		splx(s);
 		data = (void *)ccb->ccb_abuf;
 		if ((ccb->ccb_flags & TWE_CCB_DATA_OUT) != 0)
 			memcpy(data, ccb->ccb_data, ccb->ccb_datasize);
 	} else {
 		ccb->ccb_abuf = (vaddr_t)0;
 		data = ccb->ccb_data;
+	}
 	/*
 	 * Map the data buffer into bus space and build the S/G list.