diff --git a/sys/cam/cam_sim.h b/sys/cam/cam_sim.h --- a/sys/cam/cam_sim.h +++ b/sys/cam/cam_sim.h @@ -102,8 +102,6 @@ int max_tagged_dev_openings; int max_dev_openings; u_int32_t flags; -#define CAM_SIM_REL_TIMEOUT_PENDING 0x01 - struct callout callout; struct cam_devq *devq; /* Device Queue to use for this SIM */ int refcount; /* References to the SIM. */ device_t sim_dev; /* For attached peripherals. */ diff --git a/sys/cam/cam_sim.c b/sys/cam/cam_sim.c --- a/sys/cam/cam_sim.c +++ b/sys/cam/cam_sim.c @@ -126,7 +126,6 @@ sim->refcount = 1; sim->devq = queue; sim->mtx = mtx; - callout_init(&sim->callout, 1); return (sim); } diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c --- a/sys/cam/cam_xpt.c +++ b/sys/cam/cam_xpt.c @@ -4607,15 +4607,6 @@ } else devq->send_queue.qfrozen_cnt--; if (devq->send_queue.qfrozen_cnt == 0) { - /* - * If there is a timeout scheduled to release this - * sim queue, remove it. The queue frozen count is - * already at 0. - */ - if ((sim->flags & CAM_SIM_REL_TIMEOUT_PENDING) != 0){ - callout_stop(&sim->callout); - sim->flags &= ~CAM_SIM_REL_TIMEOUT_PENDING; - } if (run_queue) { /* * Now that we are unfrozen run the send queue.