Nuke trailing whitespace.

21 files changed, 106 insertions, 108 deletions

diff --git a/sys/dev/ata/atascsi.c b/sys/dev/ata/atascsi.c
index b1e60662199..ee0f2f434a7 100644
--- a/sys/dev/ata/atascsi.c
+++ b/sys/dev/ata/atascsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atascsi.c,v 1.135 2020/06/27 14:29:44 krw Exp $ */
+/*	$OpenBSD: atascsi.c,v 1.136 2020/06/27 17:28:58 krw Exp $ */
 
 /*
  * Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -389,7 +389,7 @@ atascsi_probe(struct scsi_link *link)
 		}
 	}
 
-	if (ISSET(letoh16(ap->ap_identify.data_set_mgmt), 
+	if (ISSET(letoh16(ap->ap_identify.data_set_mgmt),
 	    ATA_ID_DATA_SET_MGMT_TRIM))
 		SET(ap->ap_features, ATA_PORT_F_TRIM);
 
@@ -1252,7 +1252,7 @@ ata_identify_blocksize(struct ata_identify *id)
 {
 	u_int			blocksize = 512;
 	u_int16_t		p2l_sect = letoh16(id->p2l_sect);
-	
+
 	if ((p2l_sect & ATA_ID_P2L_SECT_MASK) == ATA_ID_P2L_SECT_VALID &&
 	    ISSET(p2l_sect, ATA_ID_P2L_SECT_SIZESET)) {
 		blocksize = letoh16(id->words_lsec[1]);
@@ -1269,7 +1269,7 @@ ata_identify_block_l2p_exp(struct ata_identify *id)
 {
 	u_int			exponent = 0;
 	u_int16_t		p2l_sect = letoh16(id->p2l_sect);
-	
+
 	if ((p2l_sect & ATA_ID_P2L_SECT_MASK) == ATA_ID_P2L_SECT_VALID &&
 	    ISSET(p2l_sect, ATA_ID_P2L_SECT_SET)) {
 		exponent = (p2l_sect & ATA_ID_P2L_SECT_SIZE);
@@ -1284,7 +1284,7 @@ ata_identify_block_logical_align(struct ata_identify *id)
 	u_int			align = 0;
 	u_int16_t		p2l_sect = letoh16(id->p2l_sect);
 	u_int16_t		logical_align = letoh16(id->logical_align);
-	
+
 	if ((p2l_sect & ATA_ID_P2L_SECT_MASK) == ATA_ID_P2L_SECT_VALID &&
 	    ISSET(p2l_sect, ATA_ID_P2L_SECT_SET) &&
 	    (logical_align & ATA_ID_LALIGN_MASK) == ATA_ID_LALIGN_VALID)
@@ -1347,7 +1347,7 @@ atascsi_disk_capacity16(struct scsi_xfer *xs)
 	if (ISSET(ap->ap_features, ATA_PORT_F_TRIM)) {
 		SET(lowest_aligned, READ_CAP_16_TPE);
 
-		if (ISSET(letoh16(ap->ap_identify.add_support), 
+		if (ISSET(letoh16(ap->ap_identify.add_support),
 		    ATA_ID_ADD_SUPPORT_DRT))
 			SET(lowest_aligned, READ_CAP_16_TPRZ);
 	}
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c
index 3347b146c8a..171dafc2a92 100644
--- a/sys/dev/ic/aac.c
+++ b/sys/dev/ic/aac.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aac.c,v 1.79 2020/06/27 14:29:44 krw Exp $	*/
+/*	$OpenBSD: aac.c,v 1.80 2020/06/27 17:28:58 krw Exp $	*/
 
 /*-
  * Copyright (c) 2000 Michael Smith
@@ -475,13 +475,13 @@ aac_startio(struct aac_softc *sc)
 
 	for (;;) {
 		/*
-		 * Try to get a command that's been put off for lack of 
+		 * Try to get a command that's been put off for lack of
 		 * resources
 		 */
 		cm = aac_dequeue_ready(sc);
 
 		/*
-		 * Try to build a command off the bio queue (ignore error 
+		 * Try to build a command off the bio queue (ignore error
 		 * return)
 		 */
 		if (cm == NULL) {
@@ -594,9 +594,9 @@ aac_command_thread(void *arg)
 		/* Also check to see if the adapter has a command for us. */
 		while (aac_dequeue_fib(sc, AAC_HOST_NORM_CMD_QUEUE,
 				       &fib_size, &fib) == 0) {
-	
+
 			AAC_PRINT_FIB(sc, fib);
-	
+
 			switch (fib->Header.Command) {
 			case AifRequest:
 				//aac_handle_aif(sc, fib);
@@ -622,7 +622,7 @@ aac_command_thread(void *arg)
 					size = sizeof(struct aac_fib);
 					fib->Header.Size = size;
 				}
-		
+
 				/*
 				 * Since we did not generate this command, it
 				 * cannot go through the normal
@@ -709,14 +709,14 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp)
 	/* build the FIB */
 	fib = cm->cm_fib;
 	fib->Header.Size = sizeof(struct aac_fib_header);
-	fib->Header.XferState =  
-		AAC_FIBSTATE_HOSTOWNED   | 
-		AAC_FIBSTATE_INITIALISED | 
-		AAC_FIBSTATE_EMPTY	 | 
+	fib->Header.XferState =
+		AAC_FIBSTATE_HOSTOWNED   |
+		AAC_FIBSTATE_INITIALISED |
+		AAC_FIBSTATE_EMPTY	 |
 		AAC_FIBSTATE_FROMHOST	 |
 		AAC_FIBSTATE_REXPECTED   |
 		AAC_FIBSTATE_NORM	 |
-		AAC_FIBSTATE_ASYNC	 |
+	 	AAC_FIBSTATE_ASYNC	 |
 		AAC_FIBSTATE_FAST_RESPONSE;
 
 	switch(xs->cmd->opcode) {
@@ -730,7 +730,7 @@ aac_bio_command(struct aac_softc *sc, struct aac_command **cmp)
 		break;
 	default:
 		panic("%s: invalid opcode %#x", sc->aac_dev.dv_xname,
-		      xs->cmd->opcode);
+		    xs->cmd->opcode);
 	}
 
 	/* build the read/write request */
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c
index fdaac14765f..b1e60b2998b 100644
--- a/sys/dev/ic/aic6360.c
+++ b/sys/dev/ic/aic6360.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aic6360.c,v 1.32 2020/06/27 14:29:44 krw Exp $	*/
+/*	$OpenBSD: aic6360.c,v 1.33 2020/06/27 17:28:58 krw Exp $	*/
 /*	$NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $	*/
 
 #ifdef DDB
@@ -236,7 +236,7 @@ aic_find(bus_space_tag_t iot, bus_space_handle_t ioh)
 	return (1);
 }
 
-/* 
+/*
  * Attach the AIC6360, fill out some high and low level data structures
  */
 void
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 05950073dc7..bffccd4e2d6 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.243 2020/06/27 14:29:44 krw Exp $	*/
+/*	$OpenBSD: ami.c,v 1.244 2020/06/27 17:28:58 krw Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -238,7 +238,7 @@ ami_allocmem(struct ami_softc *sc, size_t size)
 
 	if (bus_dmamap_create(sc->sc_dmat, size, 1, size, 0,
 	    BUS_DMA_NOWAIT | BUS_DMA_ALLOCNOW, &am->am_map) != 0)
-		goto amfree; 
+		goto amfree;
 
 	if (bus_dmamem_alloc(sc->sc_dmat, size, PAGE_SIZE, 0, &am->am_seg, 1,
 	    &nsegs, BUS_DMA_NOWAIT | BUS_DMA_ZERO) != 0)
@@ -1055,7 +1055,7 @@ ami_complete(struct ami_softc *sc, struct ami_ccb *ccb, int timeout)
 		s = splbio(); /* interrupt handlers are called at their IPL */
 		ready = ami_intr(sc);
 		splx(s);
-		
+
 		if (ready == 0) {
 			if (timeout-- == 0) {
 				/* XXX */
@@ -1235,7 +1235,7 @@ ami_scsi_raw_cmd(struct scsi_xfer *xs)
 
 	ccb->ccb_cmd.acc_cmd = AMI_PASSTHRU;
 	ccb->ccb_cmd.acc_passthru.apt_data = ccb->ccb_ptpa;
-	
+
 	ccb->ccb_pt->apt_param = AMI_PTPARAM(AMI_TIMEOUT_6,1,0);
 	ccb->ccb_pt->apt_channel = channel;
 	ccb->ccb_pt->apt_target = target;
@@ -2011,9 +2011,9 @@ ami_disk(struct ami_softc *sc, struct bioc_disk *bd,
 
 		ch = (i & 0xf0) >> 4;
 		tg = i & 0x0f;
-		if (ami_drv_inq(sc, ch, tg, 0, inqbuf)) 
+		if (ami_drv_inq(sc, ch, tg, 0, inqbuf))
 			goto bail;
-		
+
 		vendp = inqbuf->vendor;
 		bcopy(vendp, vend, sizeof vend - 1);
 
@@ -2170,7 +2170,7 @@ ami_ioctl_vol(struct ami_softc *sc, struct bioc_vol *bv)
 	bv->bv_size *= (uint64_t)512;
 
 	strlcpy(bv->bv_dev, sc->sc_hdr[i].dev, sizeof(bv->bv_dev));
-	
+
 bail:
 	free(p, M_DEVBUF, sizeof *p);
 
diff --git a/sys/dev/ic/gdt_common.c b/sys/dev/ic/gdt_common.c
index 5cbd52d4a9a..35136fa942c 100644
--- a/sys/dev/ic/gdt_common.c
+++ b/sys/dev/ic/gdt_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gdt_common.c,v 1.70 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: gdt_common.c,v 1.71 2020/06/27 17:28:58 krw Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000, 2003 Niklas Hallqvist.  All rights reserved.
@@ -582,7 +582,7 @@ gdt_scsi_cmd(struct scsi_xfer *xs)
 		link = xs->sc_link;
 		target = link->target;
 		polled = ISSET(xs->flags, SCSI_POLL);
- 
+
 		if (!gdt_polling && !(xs->flags & SCSI_POLL) &&
 		    sc->sc_test_busy(sc)) {
 			/*
diff --git a/sys/dev/ic/mfi.c b/sys/dev/ic/mfi.c
index dc7c17e9c7d..1ac55d859da 100644
--- a/sys/dev/ic/mfi.c
+++ b/sys/dev/ic/mfi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfi.c,v 1.178 2020/06/27 14:29:45 krw Exp $ */
+/* $OpenBSD: mfi.c,v 1.179 2020/06/27 17:28:58 krw Exp $ */
 /*
  * Copyright (c) 2006 Marco Peereboom <marco@peereboom.us>
  *
@@ -1224,7 +1224,7 @@ mfi_scsi_cmd(struct scsi_xfer *xs)
 
 	if (xs->flags & SCSI_POLL)
 		mfi_poll(sc, ccb);
-	else 
+	else
 		mfi_start(sc, ccb);
 
 	KERNEL_LOCK();
diff --git a/sys/dev/ic/ncr53c9x.c b/sys/dev/ic/ncr53c9x.c
index 87e7c7e64d0..b48b7307b69 100644
--- a/sys/dev/ic/ncr53c9x.c
+++ b/sys/dev/ic/ncr53c9x.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncr53c9x.c,v 1.71 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: ncr53c9x.c,v 1.72 2020/06/27 17:28:58 krw Exp $	*/
 /*     $NetBSD: ncr53c9x.c,v 1.56 2000/11/30 14:41:46 thorpej Exp $    */
 
 /*
@@ -452,7 +452,7 @@ ncr53c9x_init(sc, doreset)
 #ifdef DEBUG
 		 if (ncr53c9x_notag)
 			 ti->flags &= ~T_TAG;
-#endif 
+#endif
 		ti->period = sc->sc_minsync;
 		ti->offset = 0;
 		ti->cfg3 = 0;
@@ -1197,11 +1197,11 @@ ncr53c9x_dequeue(sc, ecb)
 	struct ncr53c9x_softc *sc;
 	struct ncr53c9x_ecb *ecb;
 {
-	struct ncr53c9x_tinfo *ti = 
+	struct ncr53c9x_tinfo *ti =
 	    &sc->sc_tinfo[ecb->xs->sc_link->target];
 	struct ncr53c9x_linfo *li;
 	int64_t lun = ecb->xs->sc_link->lun;
-       
+
 	li = TINFO_LUN(ti, lun);
 #ifdef DIAGNOSTIC
 	if ((!li) || (li->lun != lun))
@@ -1569,7 +1569,7 @@ gotit:
 				 */
 				printf("%s: tagged queuing rejected: target %d\n",
 				    sc->sc_dev.dv_xname, ecb->xs->sc_link->target);
-				
+
 				NCR_MSGS(("(rejected sent tag)"));
 				NCRCMD(sc, NCRCMD_FLUSH);
 				DELAY(1);
@@ -1834,7 +1834,7 @@ ncr53c9x_msgout(sc)
 			    sc->sc_dev.dv_xname, __LINE__);
 		}
 	}
-			
+
 	if (sc->sc_omlen == 0) {
 		/* Pick up highest priority message */
 		sc->sc_msgout = sc->sc_msgpriq & -sc->sc_msgpriq;
@@ -1937,7 +1937,7 @@ ncr53c9x_msgout(sc)
 	}
 #endif
 	if (sc->sc_rev == NCR_VARIANT_FAS366) {
-		/*      
+		/*
 		 * XXX fifo size
 		 */
 		ncr53c9x_flushfifo(sc);
@@ -1994,12 +1994,12 @@ again:
 	 * valid condition, and we let the code check is the
 	 * "NCR_BUSFREE_OK" flag was set before declaring it
 	 * and error.
-	 * 
+	 *
 	 * Also, the status register tells us about "Gross
 	 * Errors" and "Parity errors". Only the Gross Error
-	 * is really bad, and the parity errors are dealt   
+	 * is really bad, and the parity errors are dealt
 	 * with later
-	 * 
+	 *
 	 * TODO
 	 *      If there are too many parity error, go to slow
 	 *      cable mode ?
@@ -2195,7 +2195,7 @@ again:
 
 			/* it may be OK to disconnect */
 			if ((sc->sc_flags & NCR_ABORTING) == 0) {
-				/*  
+				/*
 				 * Section 5.1.1 of the SCSI 2 spec
 				 * suggests issuing a REQUEST SENSE
 				 * following an unexpected disconnect.
@@ -2203,7 +2203,7 @@ again:
 				 * allegiance condition when
 				 * disconnecting, and this is necessary
 				 * to clean up their state.
-				 */     
+				 */
 				printf("%s: unexpected disconnect; ",
 				    sc->sc_dev.dv_xname);
 				if (ecb->flags & ECB_SENSE) {
diff --git a/sys/dev/ic/oosiop.c b/sys/dev/ic/oosiop.c
index 1b07deb1e93..1db6869f6b0 100644
--- a/sys/dev/ic/oosiop.c
+++ b/sys/dev/ic/oosiop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: oosiop.c,v 1.27 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: oosiop.c,v 1.28 2020/06/27 17:28:58 krw Exp $	*/
 /*	$NetBSD: oosiop.c,v 1.4 2003/10/29 17:45:55 tsutsui Exp $	*/
 
 /*
@@ -550,7 +550,7 @@ oosiop_setup_dma(struct oosiop_softc *sc)
 	OOSIOP_SCRIPT_SYNC(sc, BUS_DMASYNC_POSTWRITE);
 
 	oosiop_fixup_select(sc, Ent_p_select, cb->id);
-	oosiop_fixup_jump(sc, Ent_p_datain_jump, xferbase + 
+	oosiop_fixup_jump(sc, Ent_p_datain_jump, xferbase +
 	    offsetof(struct oosiop_xfer, datain_scr[0]));
 	oosiop_fixup_jump(sc, Ent_p_dataout_jump, xferbase +
 	    offsetof(struct oosiop_xfer, dataout_scr[0]));
@@ -641,7 +641,7 @@ oosiop_phasemismatch(struct oosiop_softc *sc)
 		sstat1 = oosiop_read_1(sc, OOSIOP_SSTAT1);
 		if (sstat1 & OOSIOP_SSTAT1_OLF)
 			dbc++;
-		if ((sc->sc_tgt[cb->id].sxfer != 0) && 
+		if ((sc->sc_tgt[cb->id].sxfer != 0) &&
 		    (sstat1 & OOSIOP_SSTAT1_ORF) != 0)
 			dbc++;
 
diff --git a/sys/dev/ic/qlw.c b/sys/dev/ic/qlw.c
index ca80e725c5c..4b59d38da5a 100644
--- a/sys/dev/ic/qlw.c
+++ b/sys/dev/ic/qlw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: qlw.c,v 1.36 2020/06/27 14:29:45 krw Exp $ */
+/*	$OpenBSD: qlw.c,v 1.37 2020/06/27 17:28:58 krw Exp $ */
 
 /*
  * Copyright (c) 2011 David Gwynne <dlg@openbsd.org>
@@ -267,7 +267,7 @@ qlw_attach(struct qlw_softc *sc)
 			sc->sc_max_queue_depth[bus] = sc->sc_maxrequests;
 	}
 
-	/* 
+	/*
 	 * On some 1020/1040 variants the response queue is limited to
 	 * 256 entries.  We don't really need all that many anyway.
 	 */
@@ -301,7 +301,7 @@ qlw_attach(struct qlw_softc *sc)
 		printf("couldn't set clock rate: %x\n", sc->sc_mbox[0]);
 		return (ENXIO);
 	}
-	
+
 	sc->sc_mbox[0] = QLW_MBOX_SET_RETRY_COUNT;
 	sc->sc_mbox[1] = sc->sc_retry_count[0];
 	sc->sc_mbox[2] = sc->sc_retry_delay[0];
@@ -311,7 +311,7 @@ qlw_attach(struct qlw_softc *sc)
 		printf("couldn't set retry count: %x\n", sc->sc_mbox[0]);
 		return (ENXIO);
 	}
-	
+
 	sc->sc_mbox[0] = QLW_MBOX_SET_ASYNC_DATA_SETUP;
 	sc->sc_mbox[1] = sc->sc_async_data_setup[0];
 	sc->sc_mbox[2] = sc->sc_async_data_setup[1];
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index 032ad2095e9..a15ce0e608c 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.76 2020/06/27 14:29:45 krw Exp $ */
+/*	$OpenBSD: siop.c,v 1.77 2020/06/27 17:28:58 krw Exp $ */
 /*	$NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $	*/
 
 /*
@@ -1028,7 +1028,7 @@ scintr:
 			 * case, siop_cmd->saved_offset will have the proper
 			 * value if it got updated by the controller
 			 */
-			if (offset == 0 && 
+			if (offset == 0 &&
 			    siop_cmd->saved_offset != SIOP_NOOFFSET)
 				offset = siop_cmd->saved_offset;
 			siop_update_resid(&siop_cmd->cmd_c, offset);
diff --git a/sys/dev/ic/twe.c b/sys/dev/ic/twe.c
index a327dec2cd7..3bba49f16ee 100644
--- a/sys/dev/ic/twe.c
+++ b/sys/dev/ic/twe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: twe.c,v 1.53 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: twe.c,v 1.54 2020/06/27 17:28:58 krw Exp $	*/
 
 /*
  * Copyright (c) 2000-2002 Michael Shalayeff.  All rights reserved.
@@ -119,7 +119,7 @@ twe_dispose(sc)
 			if (ccb->ccb_dmamap)
 				bus_dmamap_destroy(sc->dmat, ccb->ccb_dmamap);
 	}
-	bus_dmamem_unmap(sc->dmat, sc->sc_cmds, 
+	bus_dmamem_unmap(sc->dmat, sc->sc_cmds,
 	    sizeof(struct twe_cmd) * TWE_MAXCMDS);
 	bus_dmamem_free(sc->dmat, sc->sc_cmdseg, 1);
 }
@@ -1043,6 +1043,6 @@ twe_aen(void *cookie, void *io)
 	}
 
 	aen = *(u_int16_t *)pb->data;
-	if (aen != TWE_AEN_QEMPTY) 
+	if (aen != TWE_AEN_QEMPTY)
 		scsi_ioh_add(&sc->sc_aen);
 }
diff --git a/sys/dev/ic/uha.c b/sys/dev/ic/uha.c
index 7ef900e8e4d..02cd7eb5082 100644
--- a/sys/dev/ic/uha.c
+++ b/sys/dev/ic/uha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uha.c,v 1.31 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: uha.c,v 1.32 2020/06/27 17:28:58 krw Exp $	*/
 /*	$NetBSD: uha.c,v 1.3 1996/10/13 01:37:29 christos Exp $	*/
 
 #undef UHADEBUG
@@ -168,7 +168,7 @@ uha_mscp_free(xsc, xmscp)
  */
 void *
 uha_mscp_alloc(xsc)
-	void *xsc;	
+	void *xsc;
 {
 	struct uha_softc *sc = xsc;
 	struct uha_mscp *mscp;
diff --git a/sys/dev/pci/arc.c b/sys/dev/pci/arc.c
index d4ee993e41d..735d1ca414a 100644
--- a/sys/dev/pci/arc.c
+++ b/sys/dev/pci/arc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arc.c,v 1.112 2020/06/27 14:29:45 krw Exp $ */
+/*	$OpenBSD: arc.c,v 1.113 2020/06/27 17:28:58 krw Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -857,7 +857,7 @@ arc_activate(struct device *self, int act)
 		rv = config_activate_children(self, act);
 		break;
 	}
-	return (rv);	
+	return (rv);
 }
 
 int
@@ -933,8 +933,8 @@ arc_intr_C(void *arg)
 	int				ret = 0, throttling;
 
 	intrstat = arc_read(sc, ARC_RC_INTR_STAT);
-	if (!(intrstat & (ARC_RC_INTR_STAT_POSTQUEUE | 
-		ARC_RC_INTR_STAT_DOORBELL)))
+	if (!(intrstat & (ARC_RC_INTR_STAT_POSTQUEUE |
+	    ARC_RC_INTR_STAT_DOORBELL)))
 		return (ret);
 
 	if (intrstat & ARC_RC_INTR_STAT_DOORBELL) {
@@ -964,7 +964,7 @@ arc_intr_C(void *arg)
 				if (obmsg == ARC_FWINFO_SIGNATURE_GET_CONFIG)
 					;	/* handle devices hot-plug */
 			}
-			
+
 		}
 	}
 
@@ -1032,8 +1032,8 @@ arc_intr_D(void *arg)
 	struct arc_HBD_Msgu *pmu;
 
 	intrstat = arc_read(sc, ARC_RD_INTR_STAT);
-	if (!(intrstat & (ARC_RD_INTR_STAT_POSTQUEUE | 
-		ARC_RD_INTR_STAT_DOORBELL)))
+	if (!(intrstat & (ARC_RD_INTR_STAT_POSTQUEUE |
+	    ARC_RD_INTR_STAT_DOORBELL)))
 		return (ret);
 
 	if (intrstat & ARC_RD_INTR_STAT_DOORBELL) {
@@ -1063,7 +1063,6 @@ arc_intr_D(void *arg)
 				if (obmsg == ARC_FWINFO_SIGNATURE_GET_CONFIG)
 					;	/* handle devices hot-plug */
 			}
-			
 		}
 	}
 
@@ -1259,7 +1258,7 @@ arc_load_xs(struct arc_ccb *ccb)
 		sge->sg_hi_addr = htole32((u_int32_t)(addr >> 32));
 		sge->sg_lo_addr = htole32((u_int32_t)addr);
 	}
-	ccb->arc_io_cmd_length = sizeof(struct arc_msg_scsicmd) + 
+	ccb->arc_io_cmd_length = sizeof(struct arc_msg_scsicmd) +
 	    sizeof(struct arc_sge) * dmap->dm_nsegs;
 	msg_length = ccb->arc_io_cmd_length;
 	ccb->ccb_cmd->cmd.msgPages = (msg_length/256) + ((msg_length % 256) ? 1 : 0);
@@ -1337,7 +1336,7 @@ arc_complete(struct arc_softc *sc, struct arc_ccb *nccb, int timeout)
 	u_int16_t	doneq_index;
 	struct arc_HBD_Msgu *phbdmu;
 	int		ret = 0;
-	
+
 	arc_disable_all_intr(sc);
 	do {
 		switch(sc->sc_adp_type) {
@@ -1356,7 +1355,7 @@ arc_complete(struct arc_softc *sc, struct arc_ccb *nccb, int timeout)
 			if((write_ptr & 0xff) == (doneq_index & 0xff)) {
 Loop0:
 				reg = 0xffffffff;
-			}	
+			}
 			else {
 				doneq_index = arcmsr_get_doneq_index(phbdmu);
 				reg = phbdmu->done_qbuffer[(doneq_index & 0xFF)+1].addressLow;
@@ -1394,7 +1393,6 @@ Loop0:
 		    BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
 
 		arc_scsi_cmd_done(sc, ccb, error);
-			
 	} while (nccb != ccb);
 	arc_enable_all_intr(sc);
 
@@ -1488,7 +1486,7 @@ arc_map_pci_resources(struct arc_softc *sc, struct pci_attach_args *pa)
 				" interface register\n");
 			return(1);
 		}
-		break; 
+		break;
 	}
 
 	arc_disable_all_intr(sc);
@@ -2464,7 +2462,7 @@ arc_msgbuf(struct arc_softc *sc, void *wptr, size_t wbuflen, void *rptr,
 			 * idea of size, if required.
 			 * This deals with the growth of diskinfo struct from
 			 * 128 to 132 bytes.
-			 */ 
+			 */
 			if (sreadok && rdone >= sizeof(struct arc_fw_bufhdr) &&
 			    rlenhdr == 0) {
 				bufhdr = (struct arc_fw_bufhdr *)rbuf;
@@ -2489,7 +2487,7 @@ arc_msgbuf(struct arc_softc *sc, void *wptr, size_t wbuflen, void *rptr,
 		DNPRINTF(ARC_D_DB, "%s:  get_len: 0x%x, req_len: 0x%x\n",
 			DEVNAME(sc), bufhdr->len, rbuflen);
 	}
-	
+
 	bcopy(rbuf + sizeof(struct arc_fw_bufhdr), rptr, bufhdr->len);
 	cksum = arc_msg_cksum(rptr, bufhdr->len);
 	if (rbuf[rlen - 1] != cksum) {
@@ -2915,12 +2913,12 @@ arc_alloc_ccbs(struct arc_softc *sc)
 		ccb->cmd_dma_offset = len * i;
 
 		ccb->ccb_cmd = (struct arc_io_cmd *)&cmd[ccb->cmd_dma_offset];
-		ccb->ccb_cmd_post = (ARC_DMA_DVA(sc->sc_requests) + 
+		ccb->ccb_cmd_post = (ARC_DMA_DVA(sc->sc_requests) +
 		    ccb->cmd_dma_offset);
 		if ((sc->sc_adp_type != ARC_HBA_TYPE_C) &&
 		    (sc->sc_adp_type != ARC_HBA_TYPE_D))
-			ccb->ccb_cmd_post = ccb->ccb_cmd_post >> 
-				ARC_RA_POST_QUEUE_ADDR_SHIFT;
+			ccb->ccb_cmd_post = ccb->ccb_cmd_post >>
+			    ARC_RA_POST_QUEUE_ADDR_SHIFT;
 		arc_put_ccb(sc, ccb);
 	}
 	sc->sc_ccb_phys_hi = (u_int64_t)ARC_DMA_DVA(sc->sc_requests) >> 32;
diff --git a/sys/dev/pci/iha_pci.c b/sys/dev/pci/iha_pci.c
index 420662d035b..7e47ec069f8 100644
--- a/sys/dev/pci/iha_pci.c
+++ b/sys/dev/pci/iha_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iha_pci.c,v 1.13 2020/06/27 14:29:45 krw Exp $ */
+/*	$OpenBSD: iha_pci.c,v 1.14 2020/06/27 17:28:58 krw Exp $ */
 /*-------------------------------------------------------------------------
  *
  * Device driver for the INI-9XXXU/UW or INIC-940/950  PCI SCSI Controller.
@@ -90,7 +90,7 @@ iha_pci_attach(parent, self, aux)
 	bus_space_tag_t iot;
 	const char *intrstr;
 	int ioh_valid;
-				
+
 	/*
 	 * XXX - Tried memory mapping (using code from adw and ahc)
 	 *	 rather that IO mapping, but it didn't work at all..
@@ -106,7 +106,7 @@ iha_pci_attach(parent, self, aux)
 	sc->sc_iot  = iot;
 	sc->sc_ioh  = ioh;
 	sc->sc_dmat = pa->pa_dmat;
-	
+
 	if (pci_intr_map(pa, &ih)) {
 		printf("%s: couldn't map interrupt\n", sc->sc_dev.dv_xname);
 		return;
diff --git a/sys/dev/pci/ips.c b/sys/dev/pci/ips.c
index dd89d121f97..f301f0053e1 100644
--- a/sys/dev/pci/ips.c
+++ b/sys/dev/pci/ips.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ips.c,v 1.120 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: ips.c,v 1.121 2020/06/27 17:28:58 krw Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007, 2009 Alexander Yurchenko <grange@openbsd.org>
@@ -1562,7 +1562,7 @@ ips_error(struct ips_softc *sc, struct ips_ccb *ccb)
 			for (i = 0; i < dcdb->senselen; i++)
 				DPRINTF(IPS_D_ERR, (" %x", dcdb->sense[i]));
 		}
-	}		
+	}
 	DPRINTF(IPS_D_ERR, ("\n"));
 
 	switch (gsc) {
diff --git a/sys/dev/pci/mfii.c b/sys/dev/pci/mfii.c
index a6a70841da9..635d744ef8b 100644
--- a/sys/dev/pci/mfii.c
+++ b/sys/dev/pci/mfii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mfii.c,v 1.72 2020/06/27 14:29:45 krw Exp $ */
+/* $OpenBSD: mfii.c,v 1.73 2020/06/27 17:28:58 krw Exp $ */
 
 /*
  * Copyright (c) 2012 David Gwynne <dlg@openbsd.org>
@@ -1239,13 +1239,13 @@ mfii_aen(void *arg)
 	case MFI_EVT_PD_INSERTED_EXT:
 		if (med->med_arg_type != MFI_EVT_ARGS_PD_ADDRESS)
 			break;
-		
+
 		mfii_aen_pd_insert(sc, &med->args.pd_address);
 		break;
  	case MFI_EVT_PD_REMOVED_EXT:
 		if (med->med_arg_type != MFI_EVT_ARGS_PD_ADDRESS)
 			break;
-		
+
 		mfii_aen_pd_remove(sc, &med->args.pd_address);
 		break;
 
@@ -1360,7 +1360,7 @@ mfii_aen_ld_update(struct mfii_softc *sc)
 	for (i = 0; i < MFI_MAX_LD; i++) {
 		old = sc->sc_target_lds[i];
 		nld = newlds[i];
-		
+
 		if (old == -1 && nld != -1) {
 			DNPRINTF(MFII_D_MISC, "%s: attaching target %d\n",
 			    DEVNAME(sc), i);
@@ -3792,7 +3792,7 @@ mfii_refresh_ld_sensor(struct mfii_softc *sc, int ld)
 
 	target = sc->sc_ld_list.mll_list[ld].mll_ld.mld_target;
 	sensor = &sc->sc_sensors[target];
-	
+
 	switch(sc->sc_ld_list.mll_list[ld].mll_state) {
 	case MFI_LD_OFFLINE:
 		sensor->value = SENSOR_DRIVE_FAIL;
diff --git a/sys/dev/pci/trm_pci.c b/sys/dev/pci/trm_pci.c
index e5b234bbdff..f39f9a4d555 100644
--- a/sys/dev/pci/trm_pci.c
+++ b/sys/dev/pci/trm_pci.c
@@ -1,17 +1,17 @@
-/*	$OpenBSD: trm_pci.c,v 1.5 2020/06/27 14:29:45 krw Exp $
+/*	$OpenBSD: trm_pci.c,v 1.6 2020/06/27 17:28:58 krw Exp $
  * ------------------------------------------------------------
  *       O.S     : OpenBSD
- *    FILE NAME  : trm_pci.c                          
+ *    FILE NAME  : trm_pci.c
  *         BY    : Erich Chen     (erich@tekram.com.tw)
- *    Description: Device Driver for Tekram DC395U/UW/F,DC315/U 
- *                 PCI SCSI Bus Master Host Adapter    
+ *    Description: Device Driver for Tekram DC395U/UW/F,DC315/U
+ *                 PCI SCSI Bus Master Host Adapter
  *                 (SCSI chip set used Tekram ASIC TRM-S1040)
  * (C)Copyright 1995-1999 Tekram Technology Co., Ltd.
  * (C)Copyright 2001-2002 Ashley R. Martens and Kenneth R. Westerback
  * ------------------------------------------------------------
- *    HISTORY:                    
- *                        
- *  REV#   DATE          NAME           DESCRIPTION    
+ *    HISTORY:
+ *
+ *  REV#   DATE          NAME           DESCRIPTION
  *  1.00   05/01/99      ERICH CHEN     First released for NetBSD 1.4.x
  *  1.01   00/00/00      MARTIN AKESSON Port to OpenBSD 2.8
  *  1.02   Sep 19, 2001  ASHLEY MARTENS Cleanup and formatting
@@ -72,7 +72,7 @@ struct  cfattach trm_pci_ca = {
  * Purpose  : Check the slots looking for a board we recognize.
  *            If we find one, note ti's address (slot) and call
  *            the actual probe routine to check it out.
- * Inputs   : 
+ * Inputs   :
  * ------------------------------------------------------------
  */
 int
@@ -92,7 +92,7 @@ trm_pci_probe(struct device *parent, void *match, void *aux)
 /*
  * ------------------------------------------------------------
  * Function : trm_pci_attach
- * Purpose  : 
+ * Purpose  :
  * Inputs   :
  * ------------------------------------------------------------
  */
@@ -113,7 +113,7 @@ trm_pci_attach(struct device *parent, struct device *self, void *aux)
 	if (PCI_PRODUCT(pa->pa_id) != PCI_PRODUCT_TEKRAM2_DC3X5U)
 		return;
 
-	/* 
+	/*
 	 * mask for get correct base address of pci IO port
 	 */
 	if (pci_mapreg_map(pa, PCI_MAPREG_START, PCI_MAPREG_TYPE_IO, 0,
@@ -122,7 +122,7 @@ trm_pci_attach(struct device *parent, struct device *self, void *aux)
 		return;
 	}
 
-	/*    
+	/*
 	 * test checksum of eeprom & initial "ACB" adapter control block
 	 */
 	sc->sc_iotag    = iot;
@@ -135,7 +135,7 @@ trm_pci_attach(struct device *parent, struct device *self, void *aux)
 	}
 
 	/*
-	 *  Map and establish interrupt 
+	 *  Map and establish interrupt
 	 */
 	if (pci_intr_map(pa, &ih)) {
 		printf("%s: couldn't map interrupt\n", sc->sc_device.dv_xname);
@@ -149,7 +149,7 @@ trm_pci_attach(struct device *parent, struct device *self, void *aux)
 		if (intrstr != NULL)
 			printf(" at %s", intrstr);
 		printf("\n");
-	} else { 
+	} else {
 		if (intrstr != NULL)
 			printf(": %s\n", intrstr);
 
diff --git a/sys/dev/pv/vioscsi.c b/sys/dev/pv/vioscsi.c
index 5a794cf7e59..94b18b74e5d 100644
--- a/sys/dev/pv/vioscsi.c
+++ b/sys/dev/pv/vioscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vioscsi.c,v 1.18 2020/06/27 14:29:45 krw Exp $	*/
+/*	$OpenBSD: vioscsi.c,v 1.19 2020/06/27 17:28:58 krw Exp $	*/
 /*
  * Copyright (c) 2013 Google Inc.
  *
@@ -328,7 +328,7 @@ vioscsi_req_done(struct vioscsi_softc *sc, struct virtio_softc *vsc,
 	xs->status = vr->vr_res.status;
 	xs->resid = vr->vr_res.residual;
 
-	DPRINTF("vioscsi_req_done: done %d, %d, %zd\n", 
+	DPRINTF("vioscsi_req_done: done %d, %d, %zd\n",
 	    xs->error, xs->status, xs->resid);
 
 done:
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 073f170295a..76c3cf1d32c 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.404 2020/06/27 14:29:44 krw Exp $ */
+/* $OpenBSD: softraid.c,v 1.405 2020/06/27 17:28:58 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -3417,7 +3417,7 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc,
 			    "chunk count");
 			goto unwind;
 		}
-			
+
 		/* Ensure metadata level matches requested assembly level. */
 		if (sd->sd_meta->ssdi.ssd_level != bc->bc_level) {
 			sr_error(sc, "volume level does not match metadata "
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 2225c3eb747..df698da8fc9 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass_scsi.c,v 1.51 2020/06/27 14:29:45 krw Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.52 2020/06/27 17:28:58 krw Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -161,7 +161,7 @@ umass_scsi_probe(struct scsi_link *link)
 	/*
 	 * Create a fake devid using the vendor and product ids and the last
 	 * 12 characters of serial number, as recommended by Section 4.1.1 of
-	 * the USB Mass Storage Class - Bulk Only Transport spec. 
+	 * the USB Mass Storage Class - Bulk Only Transport spec.
 	 */
 	len = strlen(udi.udi_serial);
 	if (len >= 12) {
diff --git a/sys/dev/vscsi.c b/sys/dev/vscsi.c
index a89c1b767ce..541045c5024 100644
--- a/sys/dev/vscsi.c
+++ b/sys/dev/vscsi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vscsi.c,v 1.51 2020/06/27 14:29:44 krw Exp $ */
+/*	$OpenBSD: vscsi.c,v 1.52 2020/06/27 17:28:58 krw Exp $ */
 
 /*
  * Copyright (c) 2008 David Gwynne <dlg@openbsd.org>
@@ -18,7 +18,7 @@
 
 #include <sys/param.h>
 #include <sys/systm.h>
-#include <sys/kernel.h>  
+#include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/conf.h>
@@ -112,7 +112,7 @@ void		vscsi_ccb_put(void *, void *);
 
 void		filt_vscsidetach(struct knote *);
 int		filt_vscsiread(struct knote *, long);
-  
+
 const struct filterops vscsi_filtops = {
 	.f_flags	= FILTEROP_ISFD,
 	.f_attach	= NULL,
@@ -588,7 +588,7 @@ filt_vscsidetach(struct knote *kn)
 {
 	struct vscsi_softc *sc = kn->kn_hook;
 	struct klist *klist = &sc->sc_sel.si_note;
- 
+
 	mtx_enter(&sc->sc_sel_mtx);
 	klist_remove(klist, kn);
 	mtx_leave(&sc->sc_sel_mtx);