Remove more blinding trailing whitespace.

10 files changed, 73 insertions, 73 deletions

diff --git a/sys/arch/alpha/stand/boot/disk.c b/sys/arch/alpha/stand/boot/disk.c
index 5c108e9a9d8..6b1cbb79a55 100644
--- a/sys/arch/alpha/stand/boot/disk.c
+++ b/sys/arch/alpha/stand/boot/disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disk.c,v 1.16 2015/07/17 16:13:26 miod Exp $	*/
+/*	$OpenBSD: disk.c,v 1.17 2015/10/01 16:08:19 krw Exp $	*/
 /*	$NetBSD: disk.c,v 1.6 1997/04/06 08:40:33 cgd Exp $	*/
 
 /*
@@ -66,7 +66,7 @@ diskstrategy(void *devdata, int rw, daddr32_t bn, size_t reqcnt, void *addrvoid,
 	if ((reqcnt & 0xffffff) != reqcnt ||
 	    reqcnt == 0)
 		asm("call_pal 0");
-	    
+
 	twiddle();
 
 	/* Partial-block transfers not handled. */
@@ -97,7 +97,7 @@ diskopen(struct open_file *f, int ctlr, int unit, int part)
 
 	if (unit >= 16 || part >= MAXPARTITIONS)
 		return (ENXIO);
-	/* 
+	/*
 	 * XXX
 	 * We don't know what device names look like yet,
 	 * so we can't change them.
diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c
index 5c8d905ab9c..9d22a2baa3f 100644
--- a/sys/arch/amd64/stand/libsa/biosdev.c
+++ b/sys/arch/amd64/stand/libsa/biosdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: biosdev.c,v 1.24 2015/09/19 21:07:04 semarie Exp $	*/
+/*	$OpenBSD: biosdev.c,v 1.25 2015/10/01 16:08:19 krw Exp $	*/
 
 /*
  * Copyright (c) 1996 Michael Shalayeff
@@ -559,7 +559,7 @@ biosopen(struct open_file *f, ...)
 		return 0;
 	}
 #endif
- 
+
 	for (maj = 0; maj < nbdevs &&
 	    strncmp(dev, bdevs[maj], devlen); maj++);
 	if (maj >= nbdevs) {
diff --git a/sys/arch/armish/stand/boot/wd.c b/sys/arch/armish/stand/boot/wd.c
index a54f3ec5d06..bf384af899d 100644
--- a/sys/arch/armish/stand/boot/wd.c
+++ b/sys/arch/armish/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.11 2013/11/05 00:51:58 krw Exp $	*/
+/*	$OpenBSD: wd.c,v 1.12 2015/10/01 16:08:19 krw Exp $	*/
 /*	$NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -171,7 +171,7 @@ wdgetdisklabel(wd)
 		 * Lookup OpenBSD slice. If there is none, go ahead
 		 * and try to read the disklabel off sector #0.
 		 */
-		
+
 		memcpy(dp, &buf[DOSPARTOFF], NDOSPART * sizeof(*dp));
 		for (i = 0; i < NDOSPART; i++) {
 			if (dp[i].dp_typ == DOSPTYP_OPENBSD) {
@@ -272,7 +272,7 @@ wdstrategy(f, rw, dblk, size, buf, rsize)
 
 	if (size == 0)
 		return (0);
-    
+
 	if (rw != F_READ)
 		return EOPNOTSUPP;
 
diff --git a/sys/arch/aviion/stand/boot/sd.c b/sys/arch/aviion/stand/boot/sd.c
index 76246753eee..2f4f3b3fcb1 100644
--- a/sys/arch/aviion/stand/boot/sd.c
+++ b/sys/arch/aviion/stand/boot/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.7 2014/07/12 19:01:49 tedu Exp $	*/
+/*	$OpenBSD: sd.c,v 1.8 2015/10/01 16:08:19 krw Exp $	*/
 
 /*
  * Copyright (c) 2013 Miodrag Vallat.
@@ -54,7 +54,7 @@ sdopen(struct open_file *f, const char *ctrlname, int ctrl, int unit, int lun,
 		vdl = (struct vdm_label *)(buf + VDM_LABEL_OFFSET_ALT);
 	if (vdl->signature != VDM_LABEL_SIGNATURE)
 		return EINVAL;
-	
+
 	/* XXX ought to search for an OpenBSD vdmpart too. Too lazy for now */
 	rc = scsi_read(priv, LABELSECTOR, sizeof buf, buf, &z);
 	if (rc != 0 || z != sizeof buf)
diff --git a/sys/arch/hppa/stand/libsa/dk.c b/sys/arch/hppa/stand/libsa/dk.c
index 6190ecce420..4a73ccd8a21 100644
--- a/sys/arch/hppa/stand/libsa/dk.c
+++ b/sys/arch/hppa/stand/libsa/dk.c
@@ -1,25 +1,25 @@
-/*	$OpenBSD: dk.c,v 1.14 2012/02/25 20:12:00 miod Exp $	*/
+/*	$OpenBSD: dk.c,v 1.15 2015/10/01 16:08:20 krw Exp $	*/
 
 /*
- * Copyright 1996 1995 by Open Software Foundation, Inc.   
- *              All Rights Reserved 
- *  
- * Permission to use, copy, modify, and distribute this software and 
- * its documentation for any purpose and without fee is hereby granted, 
- * provided that the above copyright notice appears in all copies and 
- * that both the copyright notice and this permission notice appear in 
- * supporting documentation. 
- *  
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE. 
- *  
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR 
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, 
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
- * 
+ * Copyright 1996 1995 by Open Software Foundation, Inc.
+ *              All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appears in all copies and
+ * that both the copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
+ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  */
 
 #include "libsa.h"
diff --git a/sys/arch/hppa64/stand/libsa/dk.c b/sys/arch/hppa64/stand/libsa/dk.c
index 374dde5d4a3..fcbff7a2573 100644
--- a/sys/arch/hppa64/stand/libsa/dk.c
+++ b/sys/arch/hppa64/stand/libsa/dk.c
@@ -1,25 +1,25 @@
-/*	$OpenBSD: dk.c,v 1.2 2012/02/25 20:12:00 miod Exp $	*/
+/*	$OpenBSD: dk.c,v 1.3 2015/10/01 16:08:20 krw Exp $	*/
 
 /*
- * Copyright 1996 1995 by Open Software Foundation, Inc.   
- *              All Rights Reserved 
- *  
- * Permission to use, copy, modify, and distribute this software and 
- * its documentation for any purpose and without fee is hereby granted, 
- * provided that the above copyright notice appears in all copies and 
- * that both the copyright notice and this permission notice appear in 
- * supporting documentation. 
- *  
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE 
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 
- * FOR A PARTICULAR PURPOSE. 
- *  
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR 
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM 
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT, 
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION 
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 
- * 
+ * Copyright 1996 1995 by Open Software Foundation, Inc.
+ *              All Rights Reserved
+ *
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby granted,
+ * provided that the above copyright notice appears in all copies and
+ * that both the copyright notice and this permission notice appear in
+ * supporting documentation.
+ *
+ * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE.
+ *
+ * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
+ * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
  */
 
 #include "libsa.h"
diff --git a/sys/arch/socppc/stand/boot/wd.c b/sys/arch/socppc/stand/boot/wd.c
index 848ee1093c1..0f1c3c349af 100644
--- a/sys/arch/socppc/stand/boot/wd.c
+++ b/sys/arch/socppc/stand/boot/wd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wd.c,v 1.7 2013/11/05 00:51:58 krw Exp $	*/
+/*	$OpenBSD: wd.c,v 1.8 2015/10/01 16:08:20 krw Exp $	*/
 /*	$NetBSD: wd.c,v 1.5 2005/12/11 12:17:06 christos Exp $	*/
 
 /*-
@@ -101,7 +101,7 @@ wd_get_params(wd)
 #endif
 
 	wd->sc_params = *(struct ataparams *)buf;
-	
+
 	/* 48-bit LBA addressing */
 	if ((wd->sc_params.atap_cmd2_en & ATAPI_CMD2_48AD) != 0) {
 		DPRINTF(("Drive supports LBA48.\n"));
@@ -190,7 +190,7 @@ wdgetdisklabel(wd)
 		 * Lookup OpenBSD slice. If there is none, go ahead
 		 * and try to read the disklabel off sector #0.
 		 */
-		
+
 		memcpy(dp, &buf[DOSPARTOFF], NDOSPART * sizeof(*dp));
 		for (i = 0; i < NDOSPART; i++) {
 			if (dp[i].dp_typ == DOSPTYP_OPENBSD) {
@@ -291,7 +291,7 @@ wdstrategy(f, rw, dblk, size, buf, rsize)
 
 	if (size == 0)
 		return (0);
-    
+
 	if (rw != F_READ)
 		return EOPNOTSUPP;
 
diff --git a/sys/arch/sparc64/stand/ofwboot/ofdev.c b/sys/arch/sparc64/stand/ofwboot/ofdev.c
index 8df6326e188..9a69605859f 100644
--- a/sys/arch/sparc64/stand/ofwboot/ofdev.c
+++ b/sys/arch/sparc64/stand/ofwboot/ofdev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ofdev.c,v 1.24 2014/12/09 18:05:16 stsp Exp $	*/
+/*	$OpenBSD: ofdev.c,v 1.25 2015/10/01 16:08:20 krw Exp $	*/
 /*	$NetBSD: ofdev.c,v 1.1 2000/08/20 14:58:41 mrg Exp $	*/
 
 /*
@@ -72,7 +72,7 @@ filename(char *str, char *ppart)
 	char savec;
 	int dhandle;
 	char devtype[16];
-	
+
 	lp = str;
 	devtype[0] = 0;
 	*ppart = 0;
@@ -119,7 +119,7 @@ strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
 	struct of_dev *dev = devdata;
 	u_quad_t pos;
 	int n;
-	
+
 	if (rw != F_READ)
 		return EPERM;
 #ifdef SOFTRAID
@@ -130,13 +130,13 @@ strategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
 #endif
 	if (dev->type != OFDEV_DISK)
 		panic("strategy");
-	
+
 	DNPRINTF(BOOT_D_OFDEV, "strategy: block %lx, partition offset %lx, "
 	    "blksz %lx\n", (long)blk, (long)dev->partoff, (long)dev->bsize);
-	DNPRINTF(BOOT_D_OFDEV, "strategy: seek position should be: %lx\n", 
+	DNPRINTF(BOOT_D_OFDEV, "strategy: seek position should be: %lx\n",
 	    (long)((blk + dev->partoff) * dev->bsize));
 	pos = (u_quad_t)(blk + dev->partoff) * dev->bsize;
-	
+
 	for (;;) {
 		DNPRINTF(BOOT_D_OFDEV, "strategy: seeking to %lx\n", (long)pos);
 		if (OF_seek(dev->handle, pos) < 0)
@@ -159,7 +159,7 @@ devclose(struct open_file *of)
 {
 	struct of_dev *op = of->f_devdata;
 
-#ifdef NETBOOT	
+#ifdef NETBOOT
 	if (op->type == OFDEV_NET)
 		net_close(op);
 #endif
@@ -213,7 +213,7 @@ static u_long
 get_long(const void *p)
 {
 	const unsigned char *cp = p;
-	
+
 	return cp[0] | (cp[1] << 8) | (cp[2] << 16) | (cp[3] << 24);
 }
 
@@ -430,7 +430,7 @@ search_label(struct of_dev *devp, u_long off, char *buf, struct disklabel *lp,
 	struct disklabel *dlp;
 	struct sun_disklabel *slp;
 	int error;
-	
+
 	/* minimal requirements for archetypal disk label */
 	if (DL_GETDSIZE(lp) == 0)
 		DL_SETDSIZE(lp, 0x1fffffff);
@@ -487,7 +487,7 @@ load_disklabel(struct of_dev *ofdev, struct disklabel *label)
 		/* Else try MBR partitions */
 		errmsg = search_label(ofdev, LABELSECTOR, buf,
 		    label, 0);
-		if (errmsg) { 
+		if (errmsg) {
 			printf("load_disklabel: search_label says %s\n",
 			    errmsg);
 			error = ERDLAB;
@@ -608,13 +608,13 @@ devopen(struct open_file *of, const char *name, char **file)
 		if (partition) {
 			if (partition < 'a' ||
 			    partition >= 'a' + MAXPARTITIONS) {
-			    	printf("invalid partition '%c'\n", partition);
+				printf("invalid partition '%c'\n", partition);
 				return EINVAL;
 			}
 			part = partition - 'a';
 			pp = &bootdev_dip->disklabel.d_partitions[part];
 			if (pp->p_fstype == FS_UNUSED || pp->p_size == 0) {
-			    	printf("invalid partition '%c'\n", partition);
+				printf("invalid partition '%c'\n", partition);
 				return EINVAL;
 			}
 			bootdev_dip->sr_vol->sbv_part = partition;
@@ -667,7 +667,7 @@ devopen(struct open_file *of, const char *name, char **file)
 			DNPRINTF(BOOT_D_OFDEV, "devopen: setting partition %d "
 			    "offset %x\n", part, ofdev.partoff);
 		}
-		
+
 		of->f_dev = devsw;
 		of->f_devdata = &ofdev;
 #ifdef SPARC_BOOT_UFS
diff --git a/sys/arch/vax/stand/boot/ra.c b/sys/arch/vax/stand/boot/ra.c
index dbb0efca4ce..da113386fe7 100644
--- a/sys/arch/vax/stand/boot/ra.c
+++ b/sys/arch/vax/stand/boot/ra.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ra.c,v 1.5 2011/07/06 18:32:59 miod Exp $ */
+/*	$OpenBSD: ra.c,v 1.6 2015/10/01 16:08:20 krw Exp $ */
 /*	$NetBSD: ra.c,v 1.11 2002/06/04 15:13:55 ragge Exp $ */
 /*
  * Copyright (c) 1995 Ludd, University of Lule}, Sweden.
@@ -31,7 +31,7 @@
  */
 
  /* All bugs are subject to removal without further notice */
-		
+
 #define NRSP 1 /* Kludge */
 #define NCMD 1 /* Kludge */
 
@@ -80,7 +80,7 @@ raopen(struct open_file *f, int adapt, int ctlr, int unit, int part)
 	char *msg;
 
 #ifdef DEV_DEBUG
-	printf("raopen: adapter %d ctlr %d unit %d part %d\n", 
+	printf("raopen: adapter %d ctlr %d unit %d part %d\n",
 	    adapt, ctlr, unit, part);
 	printf("raopen: csrbase %x nexaddr %x\n", csrbase, nexaddr);
 #endif
@@ -276,7 +276,7 @@ rastrategy(void *f, int func, daddr32_t dblk,
 		uda.uda_cmd.mscp_seq.seq_bytecount = size;
 		uda.uda_cmd.mscp_unit = dunit;
 #ifdef DEV_DEBUG
-		printf("rastrategy: blk 0x%lx count %lx unit %x\n", 
+		printf("rastrategy: blk 0x%lx count %lx unit %x\n",
 		    uda.uda_cmd.mscp_seq.seq_lbn, size, dunit);
 #endif
 #ifdef notdef
diff --git a/sys/arch/vax/stand/boot/rom.c b/sys/arch/vax/stand/boot/rom.c
index 31ebeb7b314..fc64ca13565 100644
--- a/sys/arch/vax/stand/boot/rom.c
+++ b/sys/arch/vax/stand/boot/rom.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rom.c,v 1.5 2011/03/13 00:13:53 deraadt Exp $ */
+/*	$OpenBSD: rom.c,v 1.6 2015/10/01 16:08:20 krw Exp $ */
 /*	$NetBSD: rom.c,v 1.3 2000/07/19 00:58:25 matt Exp $ */
 /*
  * Copyright (c) 1996 Ludd, University of Lule}, Sweden.
@@ -17,7 +17,7 @@
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
- *      This product includes software developed at Ludd, University of 
+ *      This product includes software developed at Ludd, University of
  *      Lule}, Sweden and its contributors.
  * 4. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission