Replace sc_dying in favour of usbd_is_dying() and usbd_deactivate().

Okay mpi@

3 files changed, 15 insertions, 16 deletions

diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c
index 1502bb2cbb7..34d203b6afe 100644
--- a/sys/dev/usb/umass.c
+++ b/sys/dev/usb/umass.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umass.c,v 1.64 2013/05/30 16:15:02 deraadt Exp $ */
+/*	$OpenBSD: umass.c,v 1.65 2013/11/06 14:37:31 pirofti Exp $ */
 /*	$NetBSD: umass.c,v 1.116 2004/06/30 05:53:46 mycroft Exp $	*/
 
 /*
@@ -680,7 +680,7 @@ umass_activate(struct device *dev, int act)
 
 	switch (act) {
 	case DVACT_DEACTIVATE:
-		sc->sc_dying = 1;
+		usbd_deactivate(sc->sc_udev);
 		if (scbus == NULL || scbus->sc_child == NULL)
 			break;
 		rv = config_deactivate(scbus->sc_child);
@@ -726,7 +726,7 @@ umass_polled_transfer(struct umass_softc *sc, struct usbd_xfer *xfer)
 {
 	usbd_status err;
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return (USBD_IOERROR);
 
 	/*
@@ -787,7 +787,7 @@ umass_setup_transfer(struct umass_softc *sc, struct usbd_pipe *pipe,
 {
 	usbd_status err;
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return (USBD_IOERROR);
 
 	/* Initialise a USB transfer and then schedule it */
@@ -822,7 +822,7 @@ umass_setup_ctrl_transfer(struct umass_softc *sc, usb_device_request_t *req,
 {
 	usbd_status err;
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return (USBD_IOERROR);
 
 	/* Initialise a USB control transfer and then schedule it */
@@ -892,7 +892,7 @@ void
 umass_clear_endpoint_stall(struct umass_softc *sc, int endpt,
     struct usbd_xfer *xfer)
 {
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return;
 
 	DPRINTF(UDMASS_BBB, ("%s: Clear endpoint 0x%02x stall\n",
@@ -931,7 +931,7 @@ umass_bbb_reset(struct umass_softc *sc, int status)
 		("sc->sc_wire == 0x%02x wrong for umass_bbb_reset\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return;
 
 	/*
@@ -981,7 +981,7 @@ umass_bbb_transfer(struct umass_softc *sc, int lun, void *cmd, int cmdlen,
 		("sc->sc_wire == 0x%02x wrong for umass_bbb_transfer\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying) {
+	if (usbd_is_dying(sc->sc_udev)) {
 		sc->polled_xfer_status = USBD_IOERROR;
 		return;
 	}
@@ -1097,7 +1097,7 @@ umass_bbb_state(struct usbd_xfer *xfer, void *priv, usbd_status err)
 		("sc->sc_wire == 0x%02x wrong for umass_bbb_state\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return;
 
 	/*
@@ -1426,7 +1426,7 @@ umass_cbi_reset(struct umass_softc *sc, int status)
 		("sc->sc_wire == 0x%02x wrong for umass_cbi_reset\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return;
 
 	/*
@@ -1482,7 +1482,7 @@ umass_cbi_transfer(struct umass_softc *sc, int lun,
 		("sc->sc_wire == 0x%02x wrong for umass_cbi_transfer\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying) {
+	if (usbd_is_dying(sc->sc_udev)) {
 		sc->polled_xfer_status = USBD_IOERROR;
 		return;
 	}
@@ -1548,7 +1548,7 @@ umass_cbi_state(struct usbd_xfer *xfer, void *priv,  usbd_status err)
 		("sc->sc_wire == 0x%02x wrong for umass_cbi_state\n",
 		sc->sc_wire));
 
-	if (sc->sc_dying)
+	if (usbd_is_dying(sc->sc_udev))
 		return;
 
 	/*
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 592a89b2f08..4942729c028 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.39 2013/04/22 01:19:09 deraadt Exp $ */
+/*	$OpenBSD: umass_scsi.c,v 1.40 2013/11/06 14:37:31 pirofti Exp $ */
 /*	$NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $	*/
 /*
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -212,7 +212,7 @@ umass_scsi_cmd(struct scsi_xfer *xs)
 		sc_link->target, sc_link->lun, xs, xs->cmd->opcode,
 		xs->datalen, sc_link->quirks, xs->flags & SCSI_POLL));
 
-	if (sc->sc_dying) {
+	if (usbd_is_dying(sc->sc_udev)) {
 		xs->error = XS_DRIVER_STUFFUP;
 		goto done;
 	}
diff --git a/sys/dev/usb/umassvar.h b/sys/dev/usb/umassvar.h
index 8734f0d0774..9280f8f54bc 100644
--- a/sys/dev/usb/umassvar.h
+++ b/sys/dev/usb/umassvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: umassvar.h,v 1.13 2013/04/15 09:23:02 mglocker Exp $ */
+/*	$OpenBSD: umassvar.h,v 1.14 2013/11/06 14:37:31 pirofti Exp $ */
 /*	$NetBSD: umassvar.h,v 1.20 2003/09/08 19:31:01 mycroft Exp $	*/
 /*-
  * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>,
@@ -258,7 +258,6 @@ struct umass_softc {
 #endif
 
 	int			sc_xfer_flags;
-	char			sc_dying;
 	int			sc_refcnt;
 	int			sc_sense;