 @@ -1,1830 +1,1833 @@
-/*	$NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $ */
+/*	$NetBSD: wd.c,v 1.387 2011/07/30 04:42:03 jakllsch Exp $ */
 /*
  * Copyright (c) 1998, 2001 Manuel Bouyer.  All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *	notice, this list of conditions and the following disclaimer in the
  *	documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR 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.
  */
 /*-
  * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Onno van der Linden.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * 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.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.386 2011/02/10 05:07:46 enami Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.387 2011/07/30 04:42:03 jakllsch Exp $");
 #include "opt_ata.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/uio.h>
 #include <sys/malloc.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/syslog.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/vnode.h>
 #if NRND > 0
 #include <sys/rnd.h>
 #endif
 #include <sys/intr.h>
 #include <sys/bus.h>
 #include <dev/ata/atareg.h>
 #include <dev/ata/atavar.h>
 #include <dev/ata/wdvar.h>
 #include <dev/ic/wdcreg.h>
 #include <sys/ataio.h>
 #include "locators.h"
 #include <prop/proplib.h>
 #define	WDIORETRIES_SINGLE 4	/* number of retries before single-sector */
 #define	WDIORETRIES	5	/* number of retries before giving up */
 #define	RECOVERYTIME hz/2	/* time to wait before retrying a cmd */
 #define	WDUNIT(dev)		DISKUNIT(dev)
 #define	WDPART(dev)		DISKPART(dev)
 #define	WDMINOR(unit, part)	DISKMINOR(unit, part)
 #define	MAKEWDDEV(maj, unit, part)	MAKEDISKDEV(maj, unit, part)
 #define	WDLABELDEV(dev)	(MAKEWDDEV(major(dev), WDUNIT(dev), RAW_PART))
 #define DEBUG_INTR   0x01
 #define DEBUG_XFERS  0x02
 #define DEBUG_STATUS 0x04
 #define DEBUG_FUNCS  0x08
 #define DEBUG_PROBE  0x10
 #ifdef ATADEBUG
 int wdcdebug_wd_mask = 0x0;
 #define ATADEBUG_PRINT(args, level) \
 	if (wdcdebug_wd_mask & (level)) \
 		printf args
 #else
 #define ATADEBUG_PRINT(args, level)
 #endif
 int	wdprobe(device_t, cfdata_t, void *);
 void	wdattach(device_t, device_t, void *);
 int	wddetach(device_t, int);
 int	wdprint(void *, char *);
 void	wdperror(const struct wd_softc *);
 static int	wdlastclose(device_t);
 static bool	wd_suspend(device_t, const pmf_qual_t *);
 static int	wd_standby(struct wd_softc *, int);
 CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc),
     wdprobe, wdattach, wddetach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
 extern struct cfdriver wd_cd;
 dev_type_open(wdopen);
 dev_type_close(wdclose);
 dev_type_read(wdread);
 dev_type_write(wdwrite);
 dev_type_ioctl(wdioctl);
 dev_type_strategy(wdstrategy);
 dev_type_dump(wddump);
 dev_type_size(wdsize);
 const struct bdevsw wd_bdevsw = {
 	wdopen, wdclose, wdstrategy, wdioctl, wddump, wdsize, D_DISK
 };
 const struct cdevsw wd_cdevsw = {
 	wdopen, wdclose, wdread, wdwrite, wdioctl,
 	nostop, notty, nopoll, nommap, nokqfilter, D_DISK
 };
 /*
  * Glue necessary to hook WDCIOCCOMMAND into physio
  */
 struct wd_ioctl {
 	LIST_ENTRY(wd_ioctl) wi_list;
 	struct buf wi_bp;
 	struct uio wi_uio;
 	struct iovec wi_iov;
 	atareq_t wi_atareq;
 	struct wd_softc *wi_softc;
 };
 LIST_HEAD(, wd_ioctl) wi_head;
 struct	wd_ioctl *wi_find(struct buf *);
 void	wi_free(struct wd_ioctl *);
 struct	wd_ioctl *wi_get(void);
 void	wdioctlstrategy(struct buf *);
 void  wdgetdefaultlabel(struct wd_softc *, struct disklabel *);
 void  wdgetdisklabel(struct wd_softc *);
 void  wdstart(void *);
 void  wdstart1(struct wd_softc*, struct buf *);
 void  wdrestart(void *);
 void  wddone(void *);
 int   wd_get_params(struct wd_softc *, u_int8_t, struct ataparams *);
 int   wd_flushcache(struct wd_softc *, int);
 bool  wd_shutdown(device_t, int);
 int   wd_getcache(struct wd_softc *, int *);
 int   wd_setcache(struct wd_softc *, int);
 struct dkdriver wddkdriver = { wdstrategy, minphys };
 #ifdef HAS_BAD144_HANDLING
 static void bad144intern(struct wd_softc *);
 #endif
 #define	WD_QUIRK_SPLIT_MOD15_WRITE	0x0001	/* must split certain writes */
 #define	WD_QUIRK_FMT "\20\1SPLIT_MOD15_WRITE\2FORCE_LBA48"
 /*
  * Quirk table for IDE drives.  Put more-specific matches first, since
  * a simple globbing routine is used for matching.
  */
 static const struct wd_quirk {
 	const char *wdq_match;		/* inquiry pattern to match */
 	int wdq_quirks;			/* drive quirks */
 } wd_quirk_table[] = {
 	/*
 	 * Some Seagate S-ATA drives have a PHY which can get confused
 	 * with the way data is packetized by some S-ATA controllers.
+	 *
 	 * The work-around is to split in two any write transfer whose
 	 * sector count % 15 == 1 (assuming 512 byte sectors).
+	 *
 	 * XXX This is an incomplete list.  There are at least a couple
 	 * XXX more model numbers.  If you have trouble with such transfers
 	 * XXX (8K is the most common) on Seagate S-ATA drives, please
 	 * XXX notify thorpej@NetBSD.org.
 	 */
 	{ "ST3120023AS",
 	  WD_QUIRK_SPLIT_MOD15_WRITE },
 	{ "ST380023AS",
 	  WD_QUIRK_SPLIT_MOD15_WRITE },
 	{ NULL,
 }
 };
 static const struct wd_quirk *
 wd_lookup_quirks(const char *name)
+{
 	const struct wd_quirk *wdq;
 	const char *estr;
 	for (wdq = wd_quirk_table; wdq->wdq_match != NULL; wdq++) {
 		/*
 		 * We only want exact matches (which include matches
 		 * against globbing characters).
 		 */
 		if (pmatch(name, wdq->wdq_match, &estr) == 2)
 			return (wdq);
+	}
 	return (NULL);
+}
 int
 wdprobe(device_t parent, cfdata_t match, void *aux)
+{
 	struct ata_device *adev = aux;
 	if (adev == NULL)
 		return 0;
 	if (adev->adev_bustype->bustype_type != SCSIPI_BUSTYPE_ATA)
 		return 0;
 	if (match->cf_loc[ATA_HLCF_DRIVE] != ATA_HLCF_DRIVE_DEFAULT &&
 	    match->cf_loc[ATA_HLCF_DRIVE] != adev->adev_drv_data->drive)
 		return 0;
 	return 1;
+}
 void
 wdattach(device_t parent, device_t self, void *aux)
+{
 	struct wd_softc *wd = device_private(self);
 	struct ata_device *adev= aux;
 	int i, blank;
 	char tbuf[41], pbuf[9], c, *p, *q;
 	const struct wd_quirk *wdq;
 	wd->sc_dev = self;
 	ATADEBUG_PRINT(("wdattach\n"), DEBUG_FUNCS | DEBUG_PROBE);
 	callout_init(&wd->sc_restart_ch, 0);
 	bufq_alloc(&wd->sc_q, BUFQ_DISK_DEFAULT_STRAT, BUFQ_SORT_RAWBLOCK);
 #ifdef WD_SOFTBADSECT
 	SLIST_INIT(&wd->sc_bslist);
 #endif
 	wd->atabus = adev->adev_bustype;
 	wd->openings = adev->adev_openings;
 	wd->drvp = adev->adev_drv_data;
 	wd->drvp->drv_done = wddone;
 	wd->drvp->drv_softc = wd->sc_dev;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	/* read our drive info */
 	if (wd_get_params(wd, AT_WAIT, &wd->sc_params) != 0) {
 		aprint_error_dev(self, "IDENTIFY failed\n");
 		return;
+	}
 	for (blank = 0, p = wd->sc_params.atap_model, q = tbuf, i = 0;
 	    i < sizeof(wd->sc_params.atap_model); i++) {
 		c = *p++;
 		if (c == '\0')
 			break;
 		if (c != ' ') {
 			if (blank) {
 				*q++ = ' ';
 				blank = 0;
+			}
 			*q++ = c;
 		} else
 			blank = 1;
+	}
 	*q++ = '\0';
 	aprint_normal_dev(self, "<%s>\n", tbuf);
 	wdq = wd_lookup_quirks(tbuf);
 	if (wdq != NULL)
 		wd->sc_quirks = wdq->wdq_quirks;
 	if (wd->sc_quirks != 0) {
 		char sbuf[sizeof(WD_QUIRK_FMT) + 64];
 		snprintb(sbuf, sizeof(sbuf), WD_QUIRK_FMT, wd->sc_quirks);
 		aprint_normal_dev(self, "quirks %s\n", sbuf);
+	}
 	if ((wd->sc_params.atap_multi & 0xff) > 1) {
 		wd->sc_multi = wd->sc_params.atap_multi & 0xff;
 	} else {
 		wd->sc_multi = 1;
+	}
 	aprint_verbose_dev(self, "drive supports %d-sector PIO transfers,",
 	    wd->sc_multi);
 	/* 48-bit LBA addressing */
 	if ((wd->sc_params.atap_cmd2_en & ATA_CMD2_LBA48) != 0)
 		wd->sc_flags |= WDF_LBA48;
 	/* Prior to ATA-4, LBA was optional. */
 	if ((wd->sc_params.atap_capabilities1 & WDC_CAP_LBA) != 0)
 		wd->sc_flags |= WDF_LBA;
 #if 0
 	/* ATA-4 requires LBA. */
 	if (wd->sc_params.atap_ataversion != 0xffff &&
 	    wd->sc_params.atap_ataversion >= WDC_VER_ATA4)
 		wd->sc_flags |= WDF_LBA;
 #endif
 	if ((wd->sc_flags & WDF_LBA48) != 0) {
 		aprint_verbose(" LBA48 addressing\n");
 		wd->sc_capacity =
 		    ((u_int64_t) wd->sc_params.atap_max_lba[3] << 48) |
 		    ((u_int64_t) wd->sc_params.atap_max_lba[2] << 32) |
 		    ((u_int64_t) wd->sc_params.atap_max_lba[1] << 16) |
 		    ((u_int64_t) wd->sc_params.atap_max_lba[0] <<  0);
 		wd->sc_capacity28 =
 		    (wd->sc_params.atap_capacity[1] << 16) |
 		    wd->sc_params.atap_capacity[0];
 	} else if ((wd->sc_flags & WDF_LBA) != 0) {
 		aprint_verbose(" LBA addressing\n");
 		wd->sc_capacity28 = wd->sc_capacity =
 		    (wd->sc_params.atap_capacity[1] << 16) |
 		    wd->sc_params.atap_capacity[0];
 	} else {
 		aprint_verbose(" chs addressing\n");
 		wd->sc_capacity28 = wd->sc_capacity =
 		    wd->sc_params.atap_cylinders *
 		    wd->sc_params.atap_heads *
 		    wd->sc_params.atap_sectors;
+	}
 	format_bytes(pbuf, sizeof(pbuf), wd->sc_capacity * DEV_BSIZE);
 	aprint_normal_dev(self, "%s, %d cyl, %d head, %d sec, "
 	    "%d bytes/sect x %llu sectors\n",
 	    pbuf,
 	    (wd->sc_flags & WDF_LBA) ? (int)(wd->sc_capacity /
 		(wd->sc_params.atap_heads * wd->sc_params.atap_sectors)) :
 		wd->sc_params.atap_cylinders,
 	    wd->sc_params.atap_heads, wd->sc_params.atap_sectors,
 	    DEV_BSIZE, (unsigned long long)wd->sc_capacity);
 	ATADEBUG_PRINT(("%s: atap_dmatiming_mimi=%d, atap_dmatiming_recom=%d\n",
 	    device_xname(self), wd->sc_params.atap_dmatiming_mimi,
 	    wd->sc_params.atap_dmatiming_recom), DEBUG_PROBE);
 	/*
 	 * Initialize and attach the disk structure.
 	 */
 	/* we fill in dk_info later */
 	disk_init(&wd->sc_dk, device_xname(wd->sc_dev), &wddkdriver);
 	disk_attach(&wd->sc_dk);
 	wd->sc_wdc_bio.lp = wd->sc_dk.dk_label;
 #if NRND > 0
 	rnd_attach_source(&wd->rnd_source, device_xname(wd->sc_dev),
 			  RND_TYPE_DISK, 0);
 #endif
 	/* Discover wedges on this disk. */
 	dkwedge_discover(&wd->sc_dk);
 	if (!pmf_device_register1(self, wd_suspend, NULL, wd_shutdown))
 		aprint_error_dev(self, "couldn't establish power handler\n");
+}
 static bool
 wd_suspend(device_t dv, const pmf_qual_t *qual)
+{
 	struct wd_softc *sc = device_private(dv);
 	wd_flushcache(sc, AT_WAIT);
 	wd_standby(sc, AT_WAIT);
 	return true;
+}
 int
 wddetach(device_t self, int flags)
+{
 	struct wd_softc *sc = device_private(self);
 	int bmaj, cmaj, i, mn, rc, s;
 	if ((rc = disk_begindetach(&sc->sc_dk, wdlastclose, self, flags)) != 0)
 		return rc;
 	/* locate the major number */
 	bmaj = bdevsw_lookup_major(&wd_bdevsw);
 	cmaj = cdevsw_lookup_major(&wd_cdevsw);
 	/* Nuke the vnodes for any open instances. */
 	for (i = 0; i < MAXPARTITIONS; i++) {
 		mn = WDMINOR(device_unit(self), i);
 		vdevgone(bmaj, mn, mn, VBLK);
 		vdevgone(cmaj, mn, mn, VCHR);
+	}
 	/* Delete all of our wedges. */
 	dkwedge_delall(&sc->sc_dk);
 	s = splbio();
 	/* Kill off any queued buffers. */
 	bufq_drain(sc->sc_q);
 	bufq_free(sc->sc_q);
 	sc->atabus->ata_killpending(sc->drvp);
 	splx(s);
 	/* Detach disk. */
 	disk_detach(&sc->sc_dk);
 	disk_destroy(&sc->sc_dk);
 #ifdef WD_SOFTBADSECT
 	/* Clean out the bad sector list */
 	while (!SLIST_EMPTY(&sc->sc_bslist)) {
 		void *head = SLIST_FIRST(&sc->sc_bslist);
 		SLIST_REMOVE_HEAD(&sc->sc_bslist, dbs_next);
 		free(head, M_TEMP);
+	}
 	sc->sc_bscount = 0;
 #endif
 	pmf_device_deregister(self);
 #if NRND > 0
 	/* Unhook the entropy source. */
 	rnd_detach_source(&sc->rnd_source);
 #endif
 	callout_destroy(&sc->sc_restart_ch);
 	sc->drvp->drive_flags = 0; /* no drive any more here */
 	return (0);
+}
 /*
  * Read/write routine for a buffer.  Validates the arguments and schedules the
  * transfer.  Does not wait for the transfer to complete.
  */
 void
 wdstrategy(struct buf *bp)
+{
 	struct wd_softc *wd =
 	    device_lookup_private(&wd_cd, WDUNIT(bp->b_dev));
 	struct disklabel *lp = wd->sc_dk.dk_label;
 	daddr_t blkno;
 	int s;
 	ATADEBUG_PRINT(("wdstrategy (%s)\n", device_xname(wd->sc_dev)),
 	    DEBUG_XFERS);
 	/* Valid request?  */
 	if (bp->b_blkno < 0 ||
 	    (bp->b_bcount % lp->d_secsize) != 0 ||
 	    (bp->b_bcount / lp->d_secsize) >= (1 << NBBY)) {
 		bp->b_error = EINVAL;
 		goto done;
+	}
 	/* If device invalidated (e.g. media change, door open,
 	 * device detachment), then error.
 	 */
 	if ((wd->sc_flags & WDF_LOADED) == 0 ||
 	    !device_is_enabled(wd->sc_dev)) {
 		bp->b_error = EIO;
 		goto done;
+	}
 	/* If it's a null transfer, return immediately. */
 	if (bp->b_bcount == 0)
 		goto done;
 	/*
 	 * Do bounds checking, adjust transfer. if error, process.
 	 * If end of partition, just return.
 	 */
 	if (WDPART(bp->b_dev) == RAW_PART) {
 		if (bounds_check_with_mediasize(bp, DEV_BSIZE,
 		    wd->sc_capacity) <= 0)
 			goto done;
 	} else {
 		if (bounds_check_with_label(&wd->sc_dk, bp,
 		    (wd->sc_flags & (WDF_WLABEL|WDF_LABELLING)) != 0) <= 0)
 			goto done;
+	}
 	/*
 	 * Now convert the block number to absolute and put it in
 	 * terms of the device's logical block size.
 	 */
 	if (lp->d_secsize >= DEV_BSIZE)
 		blkno = bp->b_blkno / (lp->d_secsize / DEV_BSIZE);
 	else
 		blkno = bp->b_blkno * (DEV_BSIZE / lp->d_secsize);
 	if (WDPART(bp->b_dev) != RAW_PART)
 		blkno += lp->d_partitions[WDPART(bp->b_dev)].p_offset;
 	bp->b_rawblkno = blkno;
 #ifdef WD_SOFTBADSECT
 	/*
 	 * If the transfer about to be attempted contains only a block that
 	 * is known to be bad then return an error for the transfer without
 	 * even attempting to start a transfer up under the premis that we
 	 * will just end up doing more retries for a transfer that will end
 	 * up failing again.
 	 * XXX:SMP - mutex required to protect with DIOCBSFLUSH
 	 */
 	if (__predict_false(!SLIST_EMPTY(&wd->sc_bslist))) {
 		struct disk_badsectors *dbs;
 		daddr_t maxblk = blkno + (bp->b_bcount >> DEV_BSHIFT) - 1;
 		SLIST_FOREACH(dbs, &wd->sc_bslist, dbs_next)
 			if ((dbs->dbs_min <= blkno && blkno <= dbs->dbs_max) ||
 			    (dbs->dbs_min <= maxblk && maxblk <= dbs->dbs_max)){
 				bp->b_error = EIO;
 				goto done;
+			}
+	}
 #endif
 	/* Queue transfer on drive, activate drive and controller if idle. */
 	s = splbio();
 	bufq_put(wd->sc_q, bp);
 	wdstart(wd);
 	splx(s);
 	return;
 done:
 	/* Toss transfer; we're done early. */
 	bp->b_resid = bp->b_bcount;
 	biodone(bp);
+}
 /*
  * Queue a drive for I/O.
  */
 void
 wdstart(void *arg)
+{
 	struct wd_softc *wd = arg;
 	struct buf *bp = NULL;
 	ATADEBUG_PRINT(("wdstart %s\n", device_xname(wd->sc_dev)),
 	    DEBUG_XFERS);
 	if (!device_is_active(wd->sc_dev))
 		return;
 	while (wd->openings > 0) {
 		/* Is there a buf for us ? */
 		if ((bp = bufq_get(wd->sc_q)) == NULL)
 			return;
 		/*
 		 * Make the command. First lock the device
 		 */
 		wd->openings--;
 		wd->retries = 0;
 		wdstart1(wd, bp);
+	}
+}
 static void
 wd_split_mod15_write(struct buf *bp)
+{
 	struct buf *obp = bp->b_private;
 	struct wd_softc *sc =
 	    device_lookup_private(&wd_cd, DISKUNIT(obp->b_dev));
 	int s;
 	if (__predict_false(bp->b_error != 0)) {
 		/*
 		 * Propagate the error.  If this was the first half of
 		 * the original transfer, make sure to account for that
 		 * in the residual.
 		 */
 		if (bp->b_data == obp->b_data)
 			bp->b_resid += bp->b_bcount;
 		goto done;
+	}
 	/*
 	 * If this was the second half of the transfer, we're all done!
 	 */
 	if (bp->b_data != obp->b_data)
 		goto done;
 	/*
 	 * Advance the pointer to the second half and issue that command
 	 * using the same opening.
 	 */
 	bp->b_flags = obp->b_flags;
 	bp->b_oflags = obp->b_oflags;
 	bp->b_cflags = obp->b_cflags;
 	bp->b_data = (char *)bp->b_data + bp->b_bcount;
 	bp->b_blkno += (bp->b_bcount / 512);
 	bp->b_rawblkno += (bp->b_bcount / 512);
 	s = splbio();
 	wdstart1(sc, bp);
 	splx(s);
 	return;
  done:
 	obp->b_error = bp->b_error;
 	obp->b_resid = bp->b_resid;
 	s = splbio();
 	putiobuf(bp);
 	biodone(obp);
 	sc->openings++;
 	splx(s);
 	/* wddone() will call wdstart() */
+}
 void
 wdstart1(struct wd_softc *wd, struct buf *bp)
+{
 	/*
 	 * Deal with the "split mod15 write" quirk.  We just divide the
 	 * transfer in two, doing the first half and then then second half
 	 * with the same command opening.
+	 *
 	 * Note we MUST do this here, because we can't let insertion
 	 * into the bufq cause the transfers to be re-merged.
 	 */
 	if (__predict_false((wd->sc_quirks & WD_QUIRK_SPLIT_MOD15_WRITE) != 0 &&
 			    (bp->b_flags & B_READ) == 0 &&
 			    bp->b_bcount > 512 &&
 			    ((bp->b_bcount / 512) % 15) == 1)) {
 		struct buf *nbp;
 		/* already at splbio */
 		nbp = getiobuf(NULL, false);
 		if (__predict_false(nbp == NULL)) {
 			/* No memory -- fail the iop. */
 			bp->b_error = ENOMEM;
 			bp->b_resid = bp->b_bcount;
 			biodone(bp);
 			wd->openings++;
 			return;
+		}
 		nbp->b_error = 0;
 		nbp->b_proc = bp->b_proc;
 		nbp->b_dev = bp->b_dev;
 		nbp->b_bcount = bp->b_bcount / 2;
 		nbp->b_bufsize = bp->b_bcount / 2;
 		nbp->b_data = bp->b_data;
 		nbp->b_blkno = bp->b_blkno;
 		nbp->b_rawblkno = bp->b_rawblkno;
 		nbp->b_flags = bp->b_flags;
 		nbp->b_oflags = bp->b_oflags;
 		nbp->b_cflags = bp->b_cflags;
 		nbp->b_iodone = wd_split_mod15_write;
 		/* Put ptr to orig buf in b_private and use new buf */
 		nbp->b_private = bp;
 		BIO_COPYPRIO(nbp, bp);
 		bp = nbp;
+	}
 	wd->sc_wdc_bio.blkno = bp->b_rawblkno;
 	wd->sc_wdc_bio.bcount = bp->b_bcount;
 	wd->sc_wdc_bio.databuf = bp->b_data;
 	wd->sc_wdc_bio.blkdone =0;
 	KASSERT(bp == wd->sc_bp || wd->sc_bp == NULL);
 	wd->sc_bp = bp;
 	/*
 	 * If we're retrying, retry in single-sector mode. This will give us
 	 * the sector number of the problem, and will eventually allow the
 	 * transfer to succeed.
 	 */
 	if (wd->retries >= WDIORETRIES_SINGLE)
 		wd->sc_wdc_bio.flags = ATA_SINGLE;
 	else
 		wd->sc_wdc_bio.flags = 0;
 	if (wd->sc_flags & WDF_LBA48 &&
 	    (wd->sc_wdc_bio.blkno +
 	     wd->sc_wdc_bio.bcount / wd->sc_dk.dk_label->d_secsize) >
 	    wd->sc_capacity28)
 		wd->sc_wdc_bio.flags |= ATA_LBA48;
 	if (wd->sc_flags & WDF_LBA)
 		wd->sc_wdc_bio.flags |= ATA_LBA;
 	if (bp->b_flags & B_READ)
 		wd->sc_wdc_bio.flags |= ATA_READ;
 	/* Instrumentation. */
 	disk_busy(&wd->sc_dk);
 	switch (wd->atabus->ata_bio(wd->drvp, &wd->sc_wdc_bio)) {
 	case ATACMD_TRY_AGAIN:
 		callout_reset(&wd->sc_restart_ch, hz, wdrestart, wd);
 		break;
 	case ATACMD_QUEUED:
 	case ATACMD_COMPLETE:
 		break;
 	default:
 		panic("wdstart1: bad return code from ata_bio()");
+	}
+}
 void
 wddone(void *v)
+{
 	struct wd_softc *wd = device_private(v);
 	struct buf *bp = wd->sc_bp;
 	const char *errmsg;
 	int do_perror = 0;
 	ATADEBUG_PRINT(("wddone %s\n", device_xname(wd->sc_dev)),
 	    DEBUG_XFERS);
 	if (bp == NULL)
 		return;
 	bp->b_resid = wd->sc_wdc_bio.bcount;
 	switch (wd->sc_wdc_bio.error) {
 	case ERR_DMA:
 		errmsg = "DMA error";
 		goto retry;
 	case ERR_DF:
 		errmsg = "device fault";
 		goto retry;
 	case TIMEOUT:
 		errmsg = "device timeout";
 		goto retry;
 	case ERR_RESET:
 		errmsg = "channel reset";
 		goto retry2;
 	case ERROR:
 		/* Don't care about media change bits */
 		if (wd->sc_wdc_bio.r_error != 0 &&
 		    (wd->sc_wdc_bio.r_error & ~(WDCE_MC | WDCE_MCR)) == 0)
 			goto noerror;
 		errmsg = "error";
 		do_perror = 1;
 retry:		/* Just reset and retry. Can we do more ? */
 		(*wd->atabus->ata_reset_drive)(wd->drvp, AT_RST_NOCMD);
 retry2:
 		diskerr(bp, "wd", errmsg, LOG_PRINTF,
 		    wd->sc_wdc_bio.blkdone, wd->sc_dk.dk_label);
 		if (wd->retries < WDIORETRIES)
 			printf(", retrying");
 		printf("\n");
 		if (do_perror)
 			wdperror(wd);
 		if (wd->retries < WDIORETRIES) {
 			wd->retries++;
 			callout_reset(&wd->sc_restart_ch, RECOVERYTIME,
 			    wdrestart, wd);
 			return;
+		}
 #ifdef WD_SOFTBADSECT
 		/*
 		 * Not all errors indicate a failed block but those that do,
 		 * put the block on the bad-block list for the device.  Only
 		 * do this for reads because the drive should do it for writes,
 		 * itself, according to Manuel.
 		 */
 		if ((bp->b_flags & B_READ) &&
 		    ((wd->drvp->ata_vers >= 4 && wd->sc_wdc_bio.r_error & 64) ||
 	     	     (wd->drvp->ata_vers < 4 && wd->sc_wdc_bio.r_error & 192))) {
 			struct disk_badsectors *dbs;
 			dbs = malloc(sizeof *dbs, M_TEMP, M_WAITOK);
 			dbs->dbs_min = bp->b_rawblkno;
 			dbs->dbs_max = dbs->dbs_min + (bp->b_bcount >> DEV_BSHIFT) - 1;
 			microtime(&dbs->dbs_failedat);
 			SLIST_INSERT_HEAD(&wd->sc_bslist, dbs, dbs_next);
 			wd->sc_bscount++;
+		}
 #endif
 		bp->b_error = EIO;
 		break;
 	case NOERROR:
 noerror:	if ((wd->sc_wdc_bio.flags & ATA_CORR) || wd->retries > 0)
 			aprint_error_dev(wd->sc_dev,
 			    "soft error (corrected)\n");
 		break;
 	case ERR_NODEV:
 		bp->b_error = EIO;
 		break;
+	}
 	disk_unbusy(&wd->sc_dk, (bp->b_bcount - bp->b_resid),
 	    (bp->b_flags & B_READ));
 #if NRND > 0
 	rnd_add_uint32(&wd->rnd_source, bp->b_blkno);
 #endif
 	/* XXX Yuck, but we don't want to increment openings in this case */
 	if (__predict_false(bp->b_iodone == wd_split_mod15_write))
 		biodone(bp);
 	else {
 		biodone(bp);
 		wd->openings++;
+	}
 	KASSERT(wd->sc_bp != NULL);
 	wd->sc_bp = NULL;
 	wdstart(wd);
+}
 void
 wdrestart(void *v)
+{
 	struct wd_softc *wd = v;
 	struct buf *bp = wd->sc_bp;
 	int s;
 	ATADEBUG_PRINT(("wdrestart %s\n", device_xname(wd->sc_dev)),
 	    DEBUG_XFERS);
 	s = splbio();
 	wdstart1(v, bp);
 	splx(s);
+}
 int
 wdread(dev_t dev, struct uio *uio, int flags)
+{
 	ATADEBUG_PRINT(("wdread\n"), DEBUG_XFERS);
 	return (physio(wdstrategy, NULL, dev, B_READ, minphys, uio));
+}
 int
 wdwrite(dev_t dev, struct uio *uio, int flags)
+{
 	ATADEBUG_PRINT(("wdwrite\n"), DEBUG_XFERS);
 	return (physio(wdstrategy, NULL, dev, B_WRITE, minphys, uio));
+}
 int
 wdopen(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct wd_softc *wd;
 	int part, error;
 	ATADEBUG_PRINT(("wdopen\n"), DEBUG_FUNCS);
 	wd = device_lookup_private(&wd_cd, WDUNIT(dev));
 	if (wd == NULL)
 		return (ENXIO);
 	if (! device_is_active(wd->sc_dev))
 		return (ENODEV);
 	part = WDPART(dev);
 	mutex_enter(&wd->sc_dk.dk_openlock);
 	/*
 	 * If there are wedges, and this is not RAW_PART, then we
 	 * need to fail.
 	 */
 	if (wd->sc_dk.dk_nwedges != 0 && part != RAW_PART) {
 		error = EBUSY;
 		goto bad1;
+	}
 	/*
 	 * If this is the first open of this device, add a reference
 	 * to the adapter.
 	 */
 	if (wd->sc_dk.dk_openmask == 0 &&
 	    (error = wd->atabus->ata_addref(wd->drvp)) != 0)
 		goto bad1;
 	if (wd->sc_dk.dk_openmask != 0) {
 		/*
 		 * If any partition is open, but the disk has been invalidated,
 		 * disallow further opens.
 		 */
 		if ((wd->sc_flags & WDF_LOADED) == 0) {
 			error = EIO;
 			goto bad2;
+		}
 	} else {
 		if ((wd->sc_flags & WDF_LOADED) == 0) {
 			wd->sc_flags |= WDF_LOADED;
 			/* Load the physical device parameters. */
 			wd_get_params(wd, AT_WAIT, &wd->sc_params);
 			/* Load the partition info if not already loaded. */
 			wdgetdisklabel(wd);
+		}
+	}
 	/* Check that the partition exists. */
 	if (part != RAW_PART &&
 	    (part >= wd->sc_dk.dk_label->d_npartitions ||
 	     wd->sc_dk.dk_label->d_partitions[part].p_fstype == FS_UNUSED)) {
 		error = ENXIO;
 		goto bad2;
+	}
 	/* Insure only one open at a time. */
 	switch (fmt) {
 	case S_IFCHR:
 		wd->sc_dk.dk_copenmask |= (1 << part);
 		break;
 	case S_IFBLK:
 		wd->sc_dk.dk_bopenmask |= (1 << part);
 		break;
+	}
 	wd->sc_dk.dk_openmask =
 	    wd->sc_dk.dk_copenmask | wd->sc_dk.dk_bopenmask;
 	mutex_exit(&wd->sc_dk.dk_openlock);
 	return 0;
  bad2:
 	if (wd->sc_dk.dk_openmask == 0)
 		wd->atabus->ata_delref(wd->drvp);
  bad1:
 	mutex_exit(&wd->sc_dk.dk_openlock);
 	return error;
+}
 /*
  * Caller must hold wd->sc_dk.dk_openlock.
  */
 static int
 wdlastclose(device_t self)
+{
 	struct wd_softc *wd = device_private(self);
 	wd_flushcache(wd, AT_WAIT);
 	if (! (wd->sc_flags & WDF_KLABEL))
 		wd->sc_flags &= ~WDF_LOADED;
 	wd->atabus->ata_delref(wd->drvp);
 	return 0;
+}
 int
 wdclose(dev_t dev, int flag, int fmt, struct lwp *l)
+{
 	struct wd_softc *wd =
 	    device_lookup_private(&wd_cd, WDUNIT(dev));
 	int part = WDPART(dev);
 	ATADEBUG_PRINT(("wdclose\n"), DEBUG_FUNCS);
 	mutex_enter(&wd->sc_dk.dk_openlock);
 	switch (fmt) {
 	case S_IFCHR:
 		wd->sc_dk.dk_copenmask &= ~(1 << part);
 		break;
 	case S_IFBLK:
 		wd->sc_dk.dk_bopenmask &= ~(1 << part);
 		break;
+	}
 	wd->sc_dk.dk_openmask =
 	    wd->sc_dk.dk_copenmask | wd->sc_dk.dk_bopenmask;
 	if (wd->sc_dk.dk_openmask == 0)
 		wdlastclose(wd->sc_dev);
 	mutex_exit(&wd->sc_dk.dk_openlock);
 	return 0;
+}
 void
 wdgetdefaultlabel(struct wd_softc *wd, struct disklabel *lp)
+{
 	ATADEBUG_PRINT(("wdgetdefaultlabel\n"), DEBUG_FUNCS);
 	memset(lp, 0, sizeof(struct disklabel));
 	lp->d_secsize = DEV_BSIZE;
 	lp->d_ntracks = wd->sc_params.atap_heads;
 	lp->d_nsectors = wd->sc_params.atap_sectors;
 	lp->d_ncylinders = (wd->sc_flags & WDF_LBA) ? wd->sc_capacity /
 		(wd->sc_params.atap_heads * wd->sc_params.atap_sectors) :
 		wd->sc_params.atap_cylinders;
 	lp->d_secpercyl = lp->d_ntracks * lp->d_nsectors;
 	if (strcmp(wd->sc_params.atap_model, "ST506") == 0)
 		lp->d_type = DTYPE_ST506;
 	else
 		lp->d_type = DTYPE_ESDI;
 	strncpy(lp->d_typename, wd->sc_params.atap_model, 16);
 	strncpy(lp->d_packname, "fictitious", 16);
 	if (wd->sc_capacity > UINT32_MAX)
 		lp->d_secperunit = UINT32_MAX;
 	else
 		lp->d_secperunit = wd->sc_capacity;
 	lp->d_rpm = 3600;
 	lp->d_interleave = 1;
 	lp->d_flags = 0;
 	lp->d_partitions[RAW_PART].p_offset = 0;
 	lp->d_partitions[RAW_PART].p_size =
 	    lp->d_secperunit * (lp->d_secsize / DEV_BSIZE);
 	lp->d_partitions[RAW_PART].p_fstype = FS_UNUSED;
 	lp->d_npartitions = RAW_PART + 1;
 	lp->d_magic = DISKMAGIC;
 	lp->d_magic2 = DISKMAGIC;
 	lp->d_checksum = dkcksum(lp);
+}
 /*
  * Fabricate a default disk label, and try to read the correct one.
  */
 void
 wdgetdisklabel(struct wd_softc *wd)
+{
 	struct disklabel *lp = wd->sc_dk.dk_label;
 	const char *errstring;
 	int s;
 	ATADEBUG_PRINT(("wdgetdisklabel\n"), DEBUG_FUNCS);
 	memset(wd->sc_dk.dk_cpulabel, 0, sizeof(struct cpu_disklabel));
 	wdgetdefaultlabel(wd, lp);
 	wd->sc_badsect[0] = -1;
 	if (wd->drvp->state > RESET) {
 		s = splbio();
 		wd->drvp->drive_flags |= DRIVE_RESET;
 		splx(s);
+	}
 	errstring = readdisklabel(MAKEWDDEV(0, device_unit(wd->sc_dev),
 				  RAW_PART), wdstrategy, lp,
 				  wd->sc_dk.dk_cpulabel);
 	if (errstring) {
 		/*
 		 * This probably happened because the drive's default
 		 * geometry doesn't match the DOS geometry.  We
 		 * assume the DOS geometry is now in the label and try
 		 * again.  XXX This is a kluge.
 		 */
 		if (wd->drvp->state > RESET) {
 			s = splbio();
 			wd->drvp->drive_flags |= DRIVE_RESET;
 			splx(s);
+		}
 		errstring = readdisklabel(MAKEWDDEV(0, device_unit(wd->sc_dev),
 		    RAW_PART), wdstrategy, lp, wd->sc_dk.dk_cpulabel);
+	}
 	if (errstring) {
 		aprint_error_dev(wd->sc_dev, "%s\n", errstring);
 		return;
+	}
 	if (wd->drvp->state > RESET) {
 		s = splbio();
 		wd->drvp->drive_flags |= DRIVE_RESET;
 		splx(s);
+	}
 #ifdef HAS_BAD144_HANDLING
 	if ((lp->d_flags & D_BADSECT) != 0)
 		bad144intern(wd);
 #endif
+}
 void
 wdperror(const struct wd_softc *wd)
+{
 	static const char *const errstr0_3[] = {"address mark not found",
 	    "track 0 not found", "aborted command", "media change requested",
 	    "id not found", "media changed", "uncorrectable data error",
 	    "bad block detected"};
 	static const char *const errstr4_5[] = {
 	    "obsolete (address mark not found)",
 	    "no media/write protected", "aborted command",
 	    "media change requested", "id not found", "media changed",
 	    "uncorrectable data error", "interface CRC error"};
 	const char *const *errstr;
 	int i;
 	const char *sep = "";
 	const char *devname = device_xname(wd->sc_dev);
 	struct ata_drive_datas *drvp = wd->drvp;
 	int errno = wd->sc_wdc_bio.r_error;
 	if (drvp->ata_vers >= 4)
 		errstr = errstr4_5;
 	else
 		errstr = errstr0_3;
 	printf("%s: (", devname);
 	if (errno == 0)
 		printf("error not notified");
 	for (i = 0; i < 8; i++) {
 		if (errno & (1 << i)) {
 			printf("%s%s", sep, errstr[i]);
 			sep = ", ";
+		}
+	}
 	printf(")\n");
+}
 int
 wdioctl(dev_t dev, u_long xfer, void *addr, int flag, struct lwp *l)
+{
 	struct wd_softc *wd =
 	    device_lookup_private(&wd_cd, WDUNIT(dev));
 	int error = 0, s;
 #ifdef __HAVE_OLD_DISKLABEL
 	struct disklabel *newlabel = NULL;
 #endif
 	ATADEBUG_PRINT(("wdioctl\n"), DEBUG_FUNCS);
 	if ((wd->sc_flags & WDF_LOADED) == 0)
 		return EIO;
 	error = disk_ioctl(&wd->sc_dk, xfer, addr, flag, l);
 	if (error != EPASSTHROUGH)
 		return (error);
 	switch (xfer) {
 #ifdef HAS_BAD144_HANDLING
 	case DIOCSBAD:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		wd->sc_dk.dk_cpulabel->bad = *(struct dkbad *)addr;
 		wd->sc_dk.dk_label->d_flags |= D_BADSECT;
 		bad144intern(wd);
 		return 0;
 #endif
 #ifdef WD_SOFTBADSECT
 	case DIOCBSLIST :
+	{
 		u_int32_t count, missing, skip;
 		struct disk_badsecinfo dbsi;
 		struct disk_badsectors *dbs;
 		size_t available;
 		uint8_t *laddr;
 		dbsi = *(struct disk_badsecinfo *)addr;
 		missing = wd->sc_bscount;
 		count = 0;
 		available = dbsi.dbsi_bufsize;
 		skip = dbsi.dbsi_skip;
 		laddr = (uint8_t *)dbsi.dbsi_buffer;
 		/*
 		 * We start this loop with the expectation that all of the
 		 * entries will be missed and decrement this counter each
 		 * time we either skip over one (already copied out) or
 		 * we actually copy it back to user space.  The structs
 		 * holding the bad sector information are copied directly
 		 * back to user space whilst the summary is returned via
 		 * the struct passed in via the ioctl.
 		 */
 		SLIST_FOREACH(dbs, &wd->sc_bslist, dbs_next) {
 			if (skip > 0) {
 				missing--;
 				skip--;
 				continue;
+			}
 			if (available < sizeof(*dbs))
 				break;
 			available -= sizeof(*dbs);
 			copyout(dbs, laddr, sizeof(*dbs));
 			laddr += sizeof(*dbs);
 			missing--;
 			count++;
+		}
 		dbsi.dbsi_left = missing;
 		dbsi.dbsi_copied = count;
 		*(struct disk_badsecinfo *)addr = dbsi;
 		return 0;
+	}
 	case DIOCBSFLUSH :
 		/* Clean out the bad sector list */
 		while (!SLIST_EMPTY(&wd->sc_bslist)) {
 			void *head = SLIST_FIRST(&wd->sc_bslist);
 			SLIST_REMOVE_HEAD(&wd->sc_bslist, dbs_next);
 			free(head, M_TEMP);
+		}
 		wd->sc_bscount = 0;
 		return 0;
 #endif
 	case DIOCGDINFO:
 		*(struct disklabel *)addr = *(wd->sc_dk.dk_label);
 		return 0;
 #ifdef __HAVE_OLD_DISKLABEL
 	case ODIOCGDINFO:
 		newlabel = malloc(sizeof *newlabel, M_TEMP, M_WAITOK);
 		if (newlabel == NULL)
 			return EIO;
 		*newlabel = *(wd->sc_dk.dk_label);
 		if (newlabel->d_npartitions <= OLDMAXPARTITIONS)
 			memcpy(addr, newlabel, sizeof (struct olddisklabel));
 		else
 			error = ENOTTY;
 		free(newlabel, M_TEMP);
 		return error;
 #endif
 	case DIOCGPART:
 		((struct partinfo *)addr)->disklab = wd->sc_dk.dk_label;
 		((struct partinfo *)addr)->part =
 		    &wd->sc_dk.dk_label->d_partitions[WDPART(dev)];
 		return 0;
 	case DIOCWDINFO:
 	case DIOCSDINFO:
 #ifdef __HAVE_OLD_DISKLABEL
 	case ODIOCWDINFO:
 	case ODIOCSDINFO:
 #endif
+	{
 		struct disklabel *lp;
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 #ifdef __HAVE_OLD_DISKLABEL
 		if (xfer == ODIOCSDINFO || xfer == ODIOCWDINFO) {
 			newlabel = malloc(sizeof *newlabel, M_TEMP, M_WAITOK);
 			if (newlabel == NULL)
 				return EIO;
 			memset(newlabel, 0, sizeof newlabel);
 			memcpy(newlabel, addr, sizeof (struct olddisklabel));
 			lp = newlabel;
 		} else
 #endif
 		lp = (struct disklabel *)addr;
 		mutex_enter(&wd->sc_dk.dk_openlock);
 		wd->sc_flags |= WDF_LABELLING;
 		error = setdisklabel(wd->sc_dk.dk_label,
 		    lp, /*wd->sc_dk.dk_openmask : */0,
 		    wd->sc_dk.dk_cpulabel);
 		if (error == 0) {
 			if (wd->drvp->state > RESET) {
 				s = splbio();
 				wd->drvp->drive_flags |= DRIVE_RESET;
 				splx(s);
+			}
 			if (xfer == DIOCWDINFO
 #ifdef __HAVE_OLD_DISKLABEL
 			    || xfer == ODIOCWDINFO
 #endif
+			    )
 				error = writedisklabel(WDLABELDEV(dev),
 				    wdstrategy, wd->sc_dk.dk_label,
 				    wd->sc_dk.dk_cpulabel);
+		}
 		wd->sc_flags &= ~WDF_LABELLING;
 		mutex_exit(&wd->sc_dk.dk_openlock);
 #ifdef __HAVE_OLD_DISKLABEL
 		if (newlabel != NULL)
 			free(newlabel, M_TEMP);
 #endif
 		return error;
+	}
 	case DIOCKLABEL:
 		if (*(int *)addr)
 			wd->sc_flags |= WDF_KLABEL;
 		else
 			wd->sc_flags &= ~WDF_KLABEL;
 		return 0;
 	case DIOCWLABEL:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
 		if (*(int *)addr)
 			wd->sc_flags |= WDF_WLABEL;
 		else
 			wd->sc_flags &= ~WDF_WLABEL;
 		return 0;
 	case DIOCGDEFLABEL:
 		wdgetdefaultlabel(wd, (struct disklabel *)addr);
 		return 0;
 #ifdef __HAVE_OLD_DISKLABEL
 	case ODIOCGDEFLABEL:
 		newlabel = malloc(sizeof *newlabel, M_TEMP, M_WAITOK);
 		if (newlabel == NULL)
 			return EIO;
 		wdgetdefaultlabel(wd, newlabel);
 		if (newlabel->d_npartitions <= OLDMAXPARTITIONS)
 			memcpy(addr, &newlabel, sizeof (struct olddisklabel));
 		else
 			error = ENOTTY;
 		free(newlabel, M_TEMP);
 		return error;
 #endif
 #ifdef notyet
 	case DIOCWFORMAT:
 		if ((flag & FWRITE) == 0)
 			return EBADF;
+		{
 		register struct format_op *fop;
 		struct iovec aiov;
 		struct uio auio;
 		fop = (struct format_op *)addr;
 		aiov.iov_base = fop->df_buf;
 		aiov.iov_len = fop->df_count;
 		auio.uio_iov = &aiov;
 		auio.uio_iovcnt = 1;
 		auio.uio_resid = fop->df_count;
 		auio.uio_offset =
 			fop->df_startblk * wd->sc_dk.dk_label->d_secsize;
 		auio.uio_vmspace = l->l_proc->p_vmspace;
 		error = physio(wdformat, NULL, dev, B_WRITE, minphys,
 		    &auio);
 		fop->df_count -= auio.uio_resid;
 		fop->df_reg[0] = wdc->sc_status;
 		fop->df_reg[1] = wdc->sc_error;
 		return error;
+		}
 #endif
 	case DIOCGCACHE:
 		return wd_getcache(wd, (int *)addr);
 	case DIOCSCACHE:
 		return wd_setcache(wd, *(int *)addr);
 	case DIOCCACHESYNC:
 		return wd_flushcache(wd, AT_WAIT);
 	case ATAIOCCOMMAND:
 		/*
 		 * Make sure this command is (relatively) safe first
 		 */
 		if ((((atareq_t *) addr)->flags & ATACMD_READ) == 0 &&
 		    (flag & FWRITE) == 0)
 			return (EBADF);
+		{
 		struct wd_ioctl *wi;
 		atareq_t *atareq = (atareq_t *) addr;
 		int error1;
 		wi = wi_get();
 		wi->wi_softc = wd;
 		wi->wi_atareq = *atareq;
 		if (atareq->datalen && atareq->flags &
 		    (ATACMD_READ | ATACMD_WRITE)) {
 			void *tbuf;
 			if (atareq->datalen < DEV_BSIZE
 			    && atareq->command == WDCC_IDENTIFY) {
 				tbuf = malloc(DEV_BSIZE, M_TEMP, M_WAITOK);
 				wi->wi_iov.iov_base = tbuf;
 				wi->wi_iov.iov_len = DEV_BSIZE;
 				UIO_SETUP_SYSSPACE(&wi->wi_uio);
 			} else {
 				tbuf = NULL;
 				wi->wi_iov.iov_base = atareq->databuf;
 				wi->wi_iov.iov_len = atareq->datalen;
 				wi->wi_uio.uio_vmspace = l->l_proc->p_vmspace;
+			}
 			wi->wi_uio.uio_iov = &wi->wi_iov;
 			wi->wi_uio.uio_iovcnt = 1;
 			wi->wi_uio.uio_resid = atareq->datalen;
 			wi->wi_uio.uio_offset = 0;
 			wi->wi_uio.uio_rw =
 			    (atareq->flags & ATACMD_READ) ? B_READ : B_WRITE;
 			error1 = physio(wdioctlstrategy, &wi->wi_bp, dev,
 			    (atareq->flags & ATACMD_READ) ? B_READ : B_WRITE,
 			    minphys, &wi->wi_uio);
 			if (tbuf != NULL && error1 == 0) {
 				error1 = copyout(tbuf, atareq->databuf,
 				    atareq->datalen);
 				free(tbuf, M_TEMP);
+			}
 		} else {
 			/* No need to call physio if we don't have any
 			   user data */
 			wi->wi_bp.b_flags = 0;
 			wi->wi_bp.b_data = 0;
 			wi->wi_bp.b_bcount = 0;
 			wi->wi_bp.b_dev = 0;
 			wi->wi_bp.b_proc = l->l_proc;
 			wdioctlstrategy(&wi->wi_bp);
 			error1 = wi->wi_bp.b_error;
+		}
 		*atareq = wi->wi_atareq;
 		wi_free(wi);
 		return(error1);
+		}
 	case DIOCAWEDGE:
+	    {
 	    	struct dkwedge_info *dkw = (void *) addr;
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 		/* If the ioctl happens here, the parent is us. */
 		strcpy(dkw->dkw_parent, device_xname(wd->sc_dev));
 		return (dkwedge_add(dkw));
+	    }
 	case DIOCDWEDGE:
+	    {
 	    	struct dkwedge_info *dkw = (void *) addr;
 		if ((flag & FWRITE) == 0)
 			return (EBADF);
 		/* If the ioctl happens here, the parent is us. */
 		strcpy(dkw->dkw_parent, device_xname(wd->sc_dev));
 		return (dkwedge_del(dkw));
+	    }
 	case DIOCLWEDGES:
+	    {
 	    	struct dkwedge_list *dkwl = (void *) addr;
 		return (dkwedge_list(&wd->sc_dk, dkwl, l));
+	    }
 	case DIOCGSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		s = splbio();
 		strlcpy(dks->dks_name, bufq_getstrategyname(wd->sc_q),
 		    sizeof(dks->dks_name));
 		splx(s);
 		dks->dks_paramlen = 0;
 		return 0;
+	    }
 	case DIOCSSTRATEGY:
+	    {
 		struct disk_strategy *dks = (void *)addr;
 		struct bufq_state *new;
 		struct bufq_state *old;
 		if ((flag & FWRITE) == 0) {
 			return EBADF;
+		}
 		if (dks->dks_param != NULL) {
 			return EINVAL;
+		}
 		dks->dks_name[sizeof(dks->dks_name) - 1] = 0; /* ensure term */
 		error = bufq_alloc(&new, dks->dks_name,
 		    BUFQ_EXACT|BUFQ_SORT_RAWBLOCK);
 		if (error) {
 			return error;
+		}
 		s = splbio();
 		old = wd->sc_q;
 		bufq_move(new, old);
 		wd->sc_q = new;
 		splx(s);
 		bufq_free(old);
 		return 0;
+	    }
 	default:
 		return ENOTTY;
+	}
 #ifdef DIAGNOSTIC
 	panic("wdioctl: impossible");
 #endif
+}
 #ifdef B_FORMAT
 int
 wdformat(struct buf *bp)
+{
 	bp->b_flags |= B_FORMAT;
 	return wdstrategy(bp);
+}
 #endif
 int
 wdsize(dev_t dev)
+{
 	struct wd_softc *wd;
 	int part, omask;
 	int size;
 	ATADEBUG_PRINT(("wdsize\n"), DEBUG_FUNCS);
 	wd = device_lookup_private(&wd_cd, WDUNIT(dev));
 	if (wd == NULL)
 		return (-1);
 	part = WDPART(dev);
 	omask = wd->sc_dk.dk_openmask & (1 << part);
 	if (omask == 0 && wdopen(dev, 0, S_IFBLK, NULL) != 0)
 		return (-1);
 	if (wd->sc_dk.dk_label->d_partitions[part].p_fstype != FS_SWAP)
 		size = -1;
 	else
 		size = wd->sc_dk.dk_label->d_partitions[part].p_size *
 		    (wd->sc_dk.dk_label->d_secsize / DEV_BSIZE);
 	if (omask == 0 && wdclose(dev, 0, S_IFBLK, NULL) != 0)
 		return (-1);
 	return (size);
+}
 /* #define WD_DUMP_NOT_TRUSTED if you just want to watch */
 static int wddoingadump = 0;
 static int wddumprecalibrated = 0;
 /*
  * Dump core after a system crash.
  */
 int
 wddump(dev_t dev, daddr_t blkno, void *va, size_t size)
+{
 	struct wd_softc *wd;	/* disk unit to do the I/O */
 	struct disklabel *lp;   /* disk's disklabel */
 	int part, err;
 	int nblks;	/* total number of sectors left to write */
 	/* Check if recursive dump; if so, punt. */
 	if (wddoingadump)
 		return EFAULT;
 	wddoingadump = 1;
 	wd = device_lookup_private(&wd_cd, WDUNIT(dev));
 	if (wd == NULL)
 		return (ENXIO);
 	part = WDPART(dev);
 	/* Convert to disk sectors.  Request must be a multiple of size. */
 	lp = wd->sc_dk.dk_label;
 	if ((size % lp->d_secsize) != 0)
 		return EFAULT;
 	nblks = size / lp->d_secsize;
 	blkno = blkno / (lp->d_secsize / DEV_BSIZE);
 	/* Check transfer bounds against partition size. */
 	if ((blkno < 0) || ((blkno + nblks) > lp->d_partitions[part].p_size))
 		return EINVAL;
 	/* Offset block number to start of partition. */
 	blkno += lp->d_partitions[part].p_offset;
 	/* Recalibrate, if first dump transfer. */
 	if (wddumprecalibrated == 0) {
 		wddumprecalibrated = 1;
 		(*wd->atabus->ata_reset_drive)(wd->drvp,
 					       AT_POLL | AT_RST_EMERG);
 		wd->drvp->state = RESET;
+	}
 	wd->sc_bp = NULL;
 	wd->sc_wdc_bio.blkno = blkno;
 	wd->sc_wdc_bio.flags = ATA_POLL;
 	if (wd->sc_flags & WDF_LBA48 &&
 	    (wd->sc_wdc_bio.blkno + nblks) > wd->sc_capacity28)
 		wd->sc_wdc_bio.flags |= ATA_LBA48;
 	if (wd->sc_flags & WDF_LBA)
 		wd->sc_wdc_bio.flags |= ATA_LBA;
 	wd->sc_wdc_bio.bcount = nblks * lp->d_secsize;
 	wd->sc_wdc_bio.databuf = va;
 #ifndef WD_DUMP_NOT_TRUSTED
 	switch (err = wd->atabus->ata_bio(wd->drvp, &wd->sc_wdc_bio)) {
 	case ATACMD_TRY_AGAIN:
 		panic("wddump: try again");
 		break;
 	case ATACMD_QUEUED:
 		panic("wddump: polled command has been queued");
 		break;
 	case ATACMD_COMPLETE:
 		break;
 	default:
 		panic("wddump: unknown atacmd code %d", err);
+	}
 	switch(err = wd->sc_wdc_bio.error) {
 	case TIMEOUT:
 		printf("wddump: device timed out");
 		err = EIO;
 		break;
 	case ERR_DF:
 		printf("wddump: drive fault");
 		err = EIO;
 		break;
 	case ERR_DMA:
 		printf("wddump: DMA error");
 		err = EIO;
 		break;
 	case ERROR:
 		printf("wddump: ");
 		wdperror(wd);
 		err = EIO;
 		break;
 	case NOERROR:
 		err = 0;
 		break;
 	default:
 		panic("wddump: unknown error type %d", err);
+	}
 	if (err != 0) {
 		printf("\n");
 		return err;
+	}
 #else	/* WD_DUMP_NOT_TRUSTED */
 	/* Let's just talk about this first... */
 	printf("wd%d: dump addr 0x%x, cylin %d, head %d, sector %d\n",
 	    unit, va, cylin, head, sector);
 	delay(500 * 1000);	/* half a second */
 #endif
 	wddoingadump = 0;
 	return 0;
+}
 #ifdef HAS_BAD144_HANDLING
 /*
  * Internalize the bad sector table.
  */
 void
 bad144intern(struct wd_softc *wd)
+{
 	struct dkbad *bt = &wd->sc_dk.dk_cpulabel->bad;
 	struct disklabel *lp = wd->sc_dk.dk_label;
 	int i = 0;
 	ATADEBUG_PRINT(("bad144intern\n"), DEBUG_XFERS);
 	for (; i < NBT_BAD; i++) {
 		if (bt->bt_bad[i].bt_cyl == 0xffff)
 			break;
 		wd->sc_badsect[i] =
 		    bt->bt_bad[i].bt_cyl * lp->d_secpercyl +
 		    (bt->bt_bad[i].bt_trksec >> 8) * lp->d_nsectors +
 		    (bt->bt_bad[i].bt_trksec & 0xff);
+	}
 	for (; i < NBT_BAD+1; i++)
 		wd->sc_badsect[i] = -1;
+}
 #endif
 static void
 wd_params_to_properties(struct wd_softc *wd, struct ataparams *params)
+{
 	prop_dictionary_t disk_info, odisk_info, geom;
 	const char *cp;
 	disk_info = prop_dictionary_create();
 	if (strcmp(wd->sc_params.atap_model, "ST506") == 0)
 		cp = "ST506";
 	else {
 		/* XXX Should have a case for ATA here, too. */
 		cp = "ESDI";
+	}
 	prop_dictionary_set_cstring_nocopy(disk_info, "type", cp);
 	geom = prop_dictionary_create();
 	prop_dictionary_set_uint64(geom, "sectors-per-unit", wd->sc_capacity);
 	prop_dictionary_set_uint32(geom, "sector-size",
 				   DEV_BSIZE /* XXX 512? */);
 	prop_dictionary_set_uint16(geom, "sectors-per-track",
 				   wd->sc_params.atap_sectors);
 	prop_dictionary_set_uint16(geom, "tracks-per-cylinder",
 				   wd->sc_params.atap_heads);
 	if (wd->sc_flags & WDF_LBA)
 		prop_dictionary_set_uint64(geom, "cylinders-per-unit",
 					   wd->sc_capacity /
 					       (wd->sc_params.atap_heads *
 					        wd->sc_params.atap_sectors));
 	else
 		prop_dictionary_set_uint16(geom, "cylinders-per-unit",
 					   wd->sc_params.atap_cylinders);
 	prop_dictionary_set(disk_info, "geometry", geom);
 	prop_object_release(geom);
 	prop_dictionary_set(device_properties(wd->sc_dev),
 			    "disk-info", disk_info);
 	/*
 	 * Don't release disk_info here; we keep a reference to it.
 	 * disk_detach() will release it when we go away.
 	 */
 	odisk_info = wd->sc_dk.dk_info;
 	wd->sc_dk.dk_info = disk_info;
 	if (odisk_info)
 		prop_object_release(odisk_info);
+}
 int
 wd_get_params(struct wd_softc *wd, u_int8_t flags, struct ataparams *params)
+{
 	switch (wd->atabus->ata_get_params(wd->drvp, flags, params)) {
 	case CMD_AGAIN:
 		return 1;
 	case CMD_ERR:
 		/*
 		 * We `know' there's a drive here; just assume it's old.
 		 * This geometry is only used to read the MBR and print a
 		 * (false) attach message.
 		 */
 		strncpy(params->atap_model, "ST506",
 		    sizeof params->atap_model);
 		params->atap_config = ATA_CFG_FIXED;
 		params->atap_cylinders = 1024;
 		params->atap_heads = 8;
 		params->atap_sectors = 17;
 		params->atap_multi = 1;
 		params->atap_capabilities1 = params->atap_capabilities2 = 0;
 		wd->drvp->ata_vers = -1; /* Mark it as pre-ATA */
 		/* FALLTHROUGH */
 	case CMD_OK:
 		wd_params_to_properties(wd, params);
 		return 0;
 	default:
 		panic("wd_get_params: bad return code from ata_get_params");
 		/* NOTREACHED */
+	}
+}
 int
 wd_getcache(struct wd_softc *wd, int *bitsp)
+{
 	struct ataparams params;
 	if (wd_get_params(wd, AT_WAIT, &params) != 0)
 		return EIO;
 	if (params.atap_cmd_set1 == 0x0000 ||
 	    params.atap_cmd_set1 == 0xffff ||
 	    (params.atap_cmd_set1 & WDC_CMD1_CACHE) == 0) {
 		*bitsp = 0;
 		return 0;
+	}
 	*bitsp = DKCACHE_WCHANGE | DKCACHE_READ;
 	if (params.atap_cmd1_en & WDC_CMD1_CACHE)
 		*bitsp |= DKCACHE_WRITE;
 	return 0;
+}
 const char at_errbits[] = "\20\10ERROR\11TIMEOU\12DF";
 int
 wd_setcache(struct wd_softc *wd, int bits)
+{
 	struct ataparams params;
 	struct ata_command ata_c;
 	if (wd_get_params(wd, AT_WAIT, &params) != 0)
 		return EIO;
 	if (params.atap_cmd_set1 == 0x0000 ||
 	    params.atap_cmd_set1 == 0xffff ||
 	    (params.atap_cmd_set1 & WDC_CMD1_CACHE) == 0)
 		return EOPNOTSUPP;
 	if ((bits & DKCACHE_READ) == 0 ||
 	    (bits & DKCACHE_SAVE) != 0)
 		return EOPNOTSUPP;
 	memset(&ata_c, 0, sizeof(struct ata_command));
 	ata_c.r_command = SET_FEATURES;
 	ata_c.r_st_bmask = 0;
 	ata_c.r_st_pmask = 0;
 	ata_c.timeout = 30000; /* 30s timeout */
 	ata_c.flags = AT_WAIT;
 	if (bits & DKCACHE_WRITE)
 		ata_c.r_features = WDSF_WRITE_CACHE_EN;
 	else
 		ata_c.r_features = WDSF_WRITE_CACHE_DS;
 	if (wd->atabus->ata_exec_command(wd->drvp, &ata_c) != ATACMD_COMPLETE) {
 		aprint_error_dev(wd->sc_dev,
 		    "wd_setcache command not complete\n");
 		return EIO;
+	}
 	if (ata_c.flags & (AT_ERROR | AT_TIMEOU | AT_DF)) {
 		char sbuf[sizeof(at_errbits) + 64];
 		snprintb(sbuf, sizeof(sbuf), at_errbits, ata_c.flags);
 		aprint_error_dev(wd->sc_dev, "wd_setcache: status=%s\n", sbuf);
 		return EIO;
+	}
 	return 0;