Nuke annoying whitespace nits to shrink some future diffs.

3 files changed, 11 insertions, 12 deletions

diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 623734ba249..c46c7d9f73c 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.353 2015/05/20 15:21:57 pelikan Exp $ */
+/* $OpenBSD: softraid.c,v 1.354 2015/05/29 13:48:45 krw Exp $ */
 /*
  * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -736,7 +736,7 @@ int
 sr_meta_read(struct sr_discipline *sd)
 {
 	struct sr_softc		*sc = sd->sd_sc;
-	struct sr_chunk_head 	*cl = &sd->sd_vol.sv_chunk_list;
+	struct sr_chunk_head	*cl = &sd->sd_vol.sv_chunk_list;
 	struct sr_metadata	*sm;
 	struct sr_chunk		*ch_entry;
 	struct sr_meta_chunk	*cp;
@@ -1605,7 +1605,7 @@ int
 sr_meta_native_attach(struct sr_discipline *sd, int force)
 {
 	struct sr_softc		*sc = sd->sd_sc;
-	struct sr_chunk_head 	*cl = &sd->sd_vol.sv_chunk_list;
+	struct sr_chunk_head	*cl = &sd->sd_vol.sv_chunk_list;
 	struct sr_metadata	*md = NULL;
 	struct sr_chunk		*ch_entry, *ch_next;
 	struct sr_uuid		uuid;
@@ -3463,7 +3463,6 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc,
 	}
 
 	if (sd->sd_capabilities & SR_CAP_SYSTEM_DISK) {
-		
 		/* Initialise volume state. */
 		sd->sd_set_vol_state(sd);
 		if (sd->sd_vol_status == BIOC_SVOFFLINE) {
@@ -3537,7 +3536,7 @@ sr_ioctl_createraid(struct sr_softc *sc, struct bioc_createraid *bc,
 		    sizeof(sd->sd_meta->ssd_devname));
 
 		sr_info(sc, "%s volume attached as %s",
-		    sd->sd_name, sd->sd_meta->ssd_devname); 
+		    sd->sd_name, sd->sd_meta->ssd_devname);
 
 		/* Update device name on any roaming chunks. */
 		sr_roam_chunks(sd);
@@ -4362,7 +4361,7 @@ sr_set_vol_state(struct sr_discipline *sd)
 
 	if (states[BIOC_SDONLINE] == nd)
 		new_state = BIOC_SVONLINE;
-	else 
+	else
 		new_state = BIOC_SVOFFLINE;
 
 	DNPRINTF(SR_D_STATE, "%s: %s: sr_set_vol_state %d -> %d\n",
diff --git a/sys/dev/softraid_raid5.c b/sys/dev/softraid_raid5.c
index 181129aa008..1229a1e8353 100644
--- a/sys/dev/softraid_raid5.c
+++ b/sys/dev/softraid_raid5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid5.c,v 1.18 2015/04/11 16:23:34 jsing Exp $ */
+/* $OpenBSD: softraid_raid5.c,v 1.19 2015/05/29 13:48:45 krw Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
@@ -514,7 +514,7 @@ sr_raid5_regenerate(struct sr_workunit *wu, int chunk, daddr_t blkno,
 	 * Regenerate a block on a RAID 5 volume by xoring the data and parity
 	 * from all of the remaining online chunks. This requires the parity
 	 * to already be correct.
- 	 */
+	 */
 
 	DNPRINTF(SR_D_DIS, "%s: %s sr_raid5_regenerate chunk %d offline, "
 	    "regenerating block %llu\n",
diff --git a/sys/dev/softraid_raid6.c b/sys/dev/softraid_raid6.c
index 1dab4e3555b..5234a11ecd7 100644
--- a/sys/dev/softraid_raid6.c
+++ b/sys/dev/softraid_raid6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid6.c,v 1.64 2015/03/14 03:38:46 jsg Exp $ */
+/* $OpenBSD: softraid_raid6.c,v 1.65 2015/05/29 13:48:45 krw Exp $ */
 /*
  * Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
  * Copyright (c) 2009 Jordan Hargrave <jordan@openbsd.org>
@@ -795,14 +795,14 @@ sr_raid6_xorp(void *p, void *d, int len)
 void
 sr_raid6_xorq(void *q, void *d, int len, int gn)
 {
-	uint32_t 	*qbuf = q, *data = d, x;
-	uint8_t	 	*gn_map = gf_map[gn];
+	uint32_t	*qbuf = q, *data = d, x;
+	uint8_t		*gn_map = gf_map[gn];
 
 	len >>= 2;
 	while (len--) {
 		x = *data++;
 		*qbuf++ ^= (((uint32_t)gn_map[x & 0xff]) |
-		  	    ((uint32_t)gn_map[(x >> 8) & 0xff] << 8) |
+			    ((uint32_t)gn_map[(x >> 8) & 0xff] << 8) |
 			    ((uint32_t)gn_map[(x >> 16) & 0xff] << 16) |
 			    ((uint32_t)gn_map[(x >> 24) & 0xff] << 24));
 	}