The last timeout_add(sc_timeout) died in the great XS_NO_CCB purge of 2017. Nuke

pointless timeout_set(sc_timoeut) and timeout_del(sc_timeout) calls and the
sc_timeout fields themselves.

4 files changed, 4 insertions, 17 deletions

diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c
index a8d2d3bb680..f785d733f29 100644
--- a/sys/scsi/cd.c
+++ b/sys/scsi/cd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd.c,v 1.251 2020/08/20 01:47:45 krw Exp $	*/
+/*	$OpenBSD: cd.c,v 1.252 2020/08/22 15:07:11 krw Exp $	*/
 /*	$NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $	*/
 
 /*
@@ -108,7 +108,6 @@ struct cd_softc {
 	}			 params;
 	struct bufq		 sc_bufq;
 	struct scsi_xshandler	 sc_xsh;
-	struct timeout		 sc_timeout;
 };
 
 void	cdstart(struct scsi_xfer *);
@@ -224,8 +223,6 @@ cdattach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 
 	scsi_xsh_set(&sc->sc_xsh, link, cdstart);
-	timeout_set(&sc->sc_timeout, (void (*)(void *))scsi_xsh_add,
-	    &sc->sc_xsh);
 
 	/* Attach disk. */
 	sc->sc_dk.dk_flags = DKF_NOLABELREAD;
@@ -425,7 +422,6 @@ cdclose(dev_t dev, int flag, int fmt, struct proc *p)
 			CLR(sc->sc_link->flags, SDEV_EJECTING);
 		}
 
-		timeout_del(&sc->sc_timeout);
 		scsi_xsh_del(&sc->sc_xsh);
 	}
 
diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c
index ad2b3bdf1e8..08ecbef65c3 100644
--- a/sys/scsi/sd.c
+++ b/sys/scsi/sd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sd.c,v 1.317 2020/08/20 01:47:45 krw Exp $	*/
+/*	$OpenBSD: sd.c,v 1.318 2020/08/22 15:07:11 krw Exp $	*/
 /*	$NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $	*/
 
 /*-
@@ -197,8 +197,6 @@ sdattach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 
 	scsi_xsh_set(&sc->sc_xsh, link, sdstart);
-	timeout_set(&sc->sc_timeout, (void (*)(void *))scsi_xsh_add,
-	    &sc->sc_xsh);
 
 	/* Spin up non-UMASS devices ready or not. */
 	if (!ISSET(link->flags, SDEV_UMASS))
@@ -292,7 +290,6 @@ sdactivate(struct device *self, int act)
 		break;
 	case DVACT_DEACTIVATE:
 		SET(sc->flags, SDF_DYING);
-		timeout_del(&sc->sc_timeout);
 		scsi_xsh_del(&sc->sc_xsh);
 		break;
 	}
@@ -526,7 +523,6 @@ sdclose(dev_t dev, int flag, int fmt, struct proc *p)
 			CLR(link->flags, SDEV_EJECTING);
 		}
 
-		timeout_del(&sc->sc_timeout);
 		scsi_xsh_del(&sc->sc_xsh);
 	}
 
diff --git a/sys/scsi/sdvar.h b/sys/scsi/sdvar.h
index c8c22737f54..0ceaf2a6692 100644
--- a/sys/scsi/sdvar.h
+++ b/sys/scsi/sdvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sdvar.h,v 1.49 2020/08/20 01:47:45 krw Exp $	*/
+/*	$OpenBSD: sdvar.h,v 1.50 2020/08/22 15:07:11 krw Exp $	*/
 /*	$NetBSD: sdvar.h,v 1.7 1998/08/17 00:49:03 mycroft Exp $	*/
 
 /*-
@@ -72,7 +72,6 @@ struct sd_softc {
 		u_int32_t	unmap_descs;	/* maximum descriptors/unmap */
 	} params;
 	void *sc_sdhook;		/* our shutdown hook */
-	struct timeout sc_timeout;
 
 	struct scsi_xshandler sc_xsh;
 };
diff --git a/sys/scsi/st.c b/sys/scsi/st.c
index 66dc3545645..4740533bab2 100644
--- a/sys/scsi/st.c
+++ b/sys/scsi/st.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: st.c,v 1.183 2020/08/20 01:47:45 krw Exp $	*/
+/*	$OpenBSD: st.c,v 1.184 2020/08/22 15:07:11 krw Exp $	*/
 /*	$NetBSD: st.c,v 1.71 1997/02/21 23:03:49 thorpej Exp $	*/
 
 /*
@@ -195,7 +195,6 @@ struct st_softc {
 
 	struct mode mode;
 	struct bufq sc_bufq;
-	struct timeout sc_timeout;
 	struct scsi_xshandler sc_xsh;
 };
 
@@ -295,8 +294,6 @@ stattach(struct device *parent, struct device *self, void *aux)
 	printf("\n");
 
 	scsi_xsh_set(&st->sc_xsh, link, ststart);
-	timeout_set(&st->sc_timeout, (void (*)(void *))scsi_xsh_set,
-	    &st->sc_xsh);
 
 	/* Set up the buf queue for this device. */
 	bufq_init(&st->sc_bufq, BUFQ_FIFO);
@@ -467,7 +464,6 @@ stclose(dev_t dev, int flags, int mode, struct proc *p)
 		break;
 	}
 	CLR(link->flags, SDEV_OPEN);
-	timeout_del(&st->sc_timeout);
 	scsi_xsh_del(&st->sc_xsh);
 
 done: