Index: sys/dev/mpr/mpr_sas.h
===================================================================
--- sys/dev/mpr/mpr_sas.h
+++ sys/dev/mpr/mpr_sas.h
@@ -91,7 +91,6 @@
 	u_int			flags;
 #define MPRSAS_IN_DISCOVERY	(1 << 0)
 #define MPRSAS_IN_STARTUP	(1 << 1)
-#define MPRSAS_DISCOVERY_TIMEOUT_PENDING	(1 << 2)
 #define MPRSAS_QUEUE_FROZEN	(1 << 3)
 #define	MPRSAS_SHUTDOWN		(1 << 4)
 #define	MPRSAS_TOREMOVE		(1 << 5)
@@ -101,7 +100,6 @@
 	struct cam_sim		*sim;
 	struct cam_path		*path;
 	struct intr_config_hook	sas_ich;
-	struct callout		discovery_callout;
 	struct mpr_event_handle	*mprsas_eh;
 
 	u_int                   startup_refcount;
Index: sys/dev/mpr/mpr_sas.c
===================================================================
--- sys/dev/mpr/mpr_sas.c
+++ sys/dev/mpr/mpr_sas.c
@@ -820,8 +820,6 @@
 	sc->sassc->startup_refcount = 0;
 	mprsas_startup_increment(sassc);
 
-	callout_init(&sassc->discovery_callout, 1 /*mpsafe*/);
-
 	mpr_unlock(sc);
 
 	/*
@@ -937,9 +935,6 @@
 
 	MPR_FUNCTRACE(sc);
 
-	if (sassc->flags & MPRSAS_DISCOVERY_TIMEOUT_PENDING)
-		callout_stop(&sassc->discovery_callout);
-
 	/*
 	 * After discovery has completed, check the mapping table for any
 	 * missing devices and update their missing counts. Only do this once
Index: sys/dev/mps/mps_sas.h
===================================================================
--- sys/dev/mps/mps_sas.h
+++ sys/dev/mps/mps_sas.h
@@ -86,16 +86,13 @@
 	u_int			flags;
 #define MPSSAS_IN_DISCOVERY	(1 << 0)
 #define MPSSAS_IN_STARTUP	(1 << 1)
-#define MPSSAS_DISCOVERY_TIMEOUT_PENDING	(1 << 2)
 #define MPSSAS_QUEUE_FROZEN	(1 << 3)
-#define	MPSSAS_SHUTDOWN		(1 << 4)
 	u_int			maxtargets;
 	struct mpssas_target	*targets;
 	struct cam_devq		*devq;
 	struct cam_sim		*sim;
 	struct cam_path		*path;
 	struct intr_config_hook	sas_ich;
-	struct callout		discovery_callout;
 	struct mps_event_handle	*mpssas_eh;
 
 	u_int                   startup_refcount;
Index: sys/dev/mps/mps_sas.c
===================================================================
--- sys/dev/mps/mps_sas.c
+++ sys/dev/mps/mps_sas.c
@@ -86,9 +86,6 @@
 #include <dev/mps/mps_table.h>
 #include <dev/mps/mps_sas.h>
 
-#define MPSSAS_DISCOVERY_TIMEOUT	20
-#define MPSSAS_MAX_DISCOVERY_TIMEOUTS	10 /* 200 seconds */
-
 /*
  * static array to check SCSI OpCode for EEDP protection bits
  */
@@ -773,8 +770,6 @@
 	sc->sassc->startup_refcount = 0;
 	mpssas_startup_increment(sassc);
 
-	callout_init(&sassc->discovery_callout, 1 /*mpsafe*/);
-
 	mps_unlock(sc);
 
 	/*
@@ -889,9 +884,6 @@
 
 	MPS_FUNCTRACE(sc);
 
-	if (sassc->flags & MPSSAS_DISCOVERY_TIMEOUT_PENDING)
-		callout_stop(&sassc->discovery_callout);
-
 	/*
 	 * After discovery has completed, check the mapping table for any
 	 * missing devices and update their missing counts. Only do this once