1 files changed, 6 insertions, 7 deletions

diff --git a/sys/dev/smartpqi/smartpqi_misc.c b/sys/dev/smartpqi/smartpqi_misc.c
index 9bf5e8c07db5e..88739853b229c 100644
--- a/sys/dev/smartpqi/smartpqi_misc.c
+++ b/sys/dev/smartpqi/smartpqi_misc.c
@@ -69,8 +69,8 @@ void os_wellness_periodic(void *data)
 	}
 
 	/* reschedule ourselves */
-	softs->os_specific.wellness_periodic = timeout(os_wellness_periodic, 
-					softs, OS_HOST_WELLNESS_TIMEOUT * hz);
+	callout_schedule(&softs->os_specific.wellness_periodic,
+	    OS_HOST_WELLNESS_TIMEOUT * hz);
 }
 
 /*
@@ -81,8 +81,7 @@ void os_stop_heartbeat_timer(pqisrc_softstate_t *softs)
 	DBG_FUNC("IN\n");
 
 	/* Kill the heart beat event */
-	untimeout(os_start_heartbeat_timer, softs, 
-			softs->os_specific.heartbeat_timeout_id);
+	callout_stop(&softs->os_specific.heartbeat_timeout_id);
 
 	DBG_FUNC("OUT\n");
 }
@@ -97,9 +96,9 @@ void os_start_heartbeat_timer(void *data)
 
 	pqisrc_heartbeat_timer_handler(softs);
 	if (!pqisrc_ctrl_offline(softs)) {
-		softs->os_specific.heartbeat_timeout_id =
-		timeout(os_start_heartbeat_timer, softs,
-		OS_FW_HEARTBEAT_TIMER_INTERVAL * hz);
+		callout_reset(&softs->os_specific.heartbeat_timeout_id,
+			      OS_FW_HEARTBEAT_TIMER_INTERVAL * hz,
+			      os_start_heartbeat_timer, softs);
 	}
 
        DBG_FUNC("OUT\n");