 @@ -1,14 +1,14 @@
-/*	$NetBSD: wd.c,v 1.374 2009/05/15 23:49:28 dyoung Exp $ */
+/*	$NetBSD: wd.c,v 1.375 2009/05/19 19:56:10 dyoung 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.
  * 3. All advertising materials mentioning features or use of this software
 @@ -49,27 +49,27 @@
  * ``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.374 2009/05/15 23:49:28 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.375 2009/05/19 19:56:10 dyoung 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>
 @@ -119,36 +119,35 @@ __KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.374
 #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	wdactivate(device_t, enum devact);
 int	wdprint(void *, char *);
 void	wdperror(const struct wd_softc *);
 static void	wdlastclose(struct wd_softc *);
 static bool	wd_suspend(device_t PMF_FN_PROTO);
 static int	wd_standby(struct wd_softc *, int);
 CFATTACH_DECL3_NEW(wd, sizeof(struct wd_softc),
-    wdprobe, wdattach, wddetach, wdactivate, NULL, NULL, DVF_DETACH_SHUTDOWN);
+    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 = {
 @@ -425,45 +424,26 @@ wdattach(device_t parent, device_t self,
+}
 static bool
 wd_suspend(device_t dv PMF_FN_ARGS)
+{
 	struct wd_softc *sc = device_private(dv);
 	wd_flushcache(sc, AT_WAIT);
 	wd_standby(sc, AT_WAIT);
 	return true;
+}
 int
 wdactivate(device_t self, enum devact act)
 	int rv = 0;
 	switch (act) {
 	case DVACT_ACTIVATE:
 		rv = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		/*
 		 * Nothing to do; we key off the device's DVF_ACTIVATE.
 		 */
 		break;
 	return (rv);
 int
 wddetach(device_t self, int flags)
+{
 	struct wd_softc *sc = device_private(self);
 	int bmaj, cmaj, i, mn, rc, s;
 	rc = 0;
 	mutex_enter(&sc->sc_dk.dk_openlock);
 	if (sc->sc_dk.dk_openmask == 0)
 		;	/* nothing to do */
 	else if ((flags & DETACH_FORCE) == 0)
 		rc = EBUSY;
 	else
 		wdlastclose(sc);
 @@ -538,28 +518,30 @@ wdstrategy(struct buf *bp)
 	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), error. */
+	/* If device invalidated (e.g. media change, door open,
-	if ((wd->sc_flags & WDF_LOADED) == 0) {
+	 * device suspension), then error.
 	 */
 	if ((wd->sc_flags & WDF_LOADED) == 0 || !device_is_active(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) {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $	*/
+/*	$NetBSD: sd.c,v 1.284 2009/05/19 19:56:11 dyoung Exp $	*/
 /*-
  * 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.
+ *
  * 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.
 @@ -37,27 +37,27 @@
  * Mellon University, makes this software available to CMU to distribute
  * or use in any manner that they see fit as long as this message is kept with
  * the software. For this reason TFS also grants any other persons or
  * organisations permission to use or modify this software.
+ *
  * TFS supplies this software to be publicly redistributed
  * on the understanding that TFS is not responsible for the correct
  * functioning of this software in any circumstances.
+ *
  * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.283 2009/05/17 18:11:34 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sd.c,v 1.284 2009/05/19 19:56:11 dyoung Exp $");
 #include "opt_scsi.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/scsiio.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 @@ -116,32 +116,31 @@ static int	sd_get_simplifiedparms(struct
 static int	sd_get_capacity(struct sd_softc *, struct disk_parms *, int);
 static int	sd_get_parms(struct sd_softc *, struct disk_parms *, int);
 static int	sd_get_parms_page4(struct sd_softc *, struct disk_parms *,
 		    int);
 static int	sd_get_parms_page5(struct sd_softc *, struct disk_parms *,
 		    int);
 static int	sd_flush(struct sd_softc *, int);
 static int	sd_getcache(struct sd_softc *, int *);
 static int	sd_setcache(struct sd_softc *, int);
 static int	sdmatch(device_t, cfdata_t, void *);
 static void	sdattach(device_t, device_t, void *);
 static int	sdactivate(device_t, enum devact);
 static int	sddetach(device_t, int);
 static void	sd_set_properties(struct sd_softc *);
 CFATTACH_DECL3_NEW(sd, sizeof(struct sd_softc), sdmatch, sdattach, sddetach,
-    sdactivate, NULL, NULL, DVF_DETACH_SHUTDOWN);
+    NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
 extern struct cfdriver sd_cd;
 static const struct scsipi_inquiry_pattern sd_patterns[] = {
 	{T_DIRECT, T_FIXED,
 	 "",         "",                 ""},
 	{T_DIRECT, T_REMOV,
 	 "",         "",                 ""},
 	{T_OPTICAL, T_FIXED,
 	 "",         "",                 ""},
 	{T_OPTICAL, T_REMOV,
 	 "",         "",                 ""},
 	{T_SIMPLE_DIRECT, T_FIXED,
 @@ -318,45 +317,26 @@ sdattach(device_t parent, device_t self,
 	 * attach the device into the random source list
 	 */
 	rnd_attach_source(&sd->rnd_source, device_xname(sd->sc_dev),
 			  RND_TYPE_DISK, 0);
 #endif
 	/* Discover wedges on this disk. */
 	dkwedge_discover(&sd->sc_dk);
 	sd_set_properties(sd);
+}
 static int
 sdactivate(device_t self, enum devact act)
 	int rv = 0;
 	switch (act) {
 	case DVACT_ACTIVATE:
 		rv = EOPNOTSUPP;
 		break;
 	case DVACT_DEACTIVATE:
 		/*
 		 * Nothing to do; we key off the device's DVF_ACTIVE.
 		 */
 		break;
 	return (rv);
 static int
 sddetach(device_t self, int flags)
+{
 	struct sd_softc *sd = device_private(self);
 	int s, bmaj, cmaj, i, mn, rc;
 	rc = 0;
 	mutex_enter(&sd->sc_dk.dk_openlock);
 	if (sd->sc_dk.dk_openmask == 0)
 		;	/* nothing to do */
 	else if ((flags & DETACH_FORCE) == 0)
 		rc = EBUSY;
 	else
 		sdlastclose(sd);