From d0ad2d4f716625863b65b471fdb91446d17e5e65 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Wed, 15 Sep 2004 15:22:02 +0000
Subject: [PATCH] timeout/untimeout ==> callout_*

---
 sys/dev/raid/ips/ips.c | 10 +++++-----
 sys/dev/raid/ips/ips.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys/dev/raid/ips/ips.c b/sys/dev/raid/ips/ips.c
index a6ec08f647..678d42c01c 100644
--- a/sys/dev/raid/ips/ips.c
+++ b/sys/dev/raid/ips/ips.c
@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ips/ips.c,v 1.12 2004/05/30 04:01:29 scottl Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips.c,v 1.8 2004/09/06 16:39:47 joerg Exp $
+ * $DragonFly: src/sys/dev/raid/ips/ips.c,v 1.9 2004/09/15 15:22:02 joerg Exp $
  */
 
 #include <dev/raid/ips/ips.h>
@@ -401,7 +401,7 @@ ips_timeout(void *arg)
 		ips_run_waiting_command(sc);
 	}
 	if (sc->state != IPS_OFFLINE)
-		sc->timer = timeout(ips_timeout, sc, 10 * hz);
+		callout_reset(&sc->timer, 10 * hz, ips_timeout, sc);
 	splx(mask);
 }
 
@@ -451,7 +451,7 @@ ips_adapter_init(ips_softc_t *sc)
 	 */
 	sc->max_cmds = 1;
 	ips_cmdqueue_init(sc);
-	callout_handle_init(&sc->timer);
+	callout_init(&sc->timer);
 	if (sc->ips_adapter_reinit(sc, 0))
 		goto error;
 	IPS_LOCK_INIT(sc);
@@ -495,7 +495,7 @@ ips_adapter_init(ips_softc_t *sc)
 				   "ips%d", device_get_unit(sc->dev));
 	dev->si_drv1 = sc;
 	ips_diskdev_init(sc);
-	sc->timer = timeout(ips_timeout, sc, 10*hz);
+	callout_reset(&sc->timer, 10 * hz, ips_timeout, sc);
 	return 0;
 error:
 	ips_adapter_free(sc);
@@ -576,7 +576,7 @@ ips_adapter_free(ips_softc_t *sc)
 	}
 	DEVICE_PRINTF(1, sc->dev, "free\n");
 	mask = splbio();
-	untimeout(ips_timeout, sc, sc->timer);
+	callout_stop(&sc->timer);
 	splx(mask);
 	IPS_LOCK_FREE(sc);
 	if (sc->sg_dmatag)
diff --git a/sys/dev/raid/ips/ips.h b/sys/dev/raid/ips/ips.h
index 95bf28f77b..c5bc3b4bbc 100644
--- a/sys/dev/raid/ips/ips.h
+++ b/sys/dev/raid/ips/ips.h
@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/ips/ips.h,v 1.10 2004/05/30 20:08:34 phk Exp $
- * $DragonFly: src/sys/dev/raid/ips/ips.h,v 1.3 2004/09/06 16:39:47 joerg Exp $
+ * $DragonFly: src/sys/dev/raid/ips/ips.h,v 1.4 2004/09/15 15:22:02 joerg Exp $
  */
 
 
@@ -465,7 +465,7 @@ typedef struct ips_softc {
 	bus_dma_tag_t		command_dmatag;
 	bus_dma_tag_t		sg_dmatag;
 	device_t		dev;
-	struct callout_handle	timer;
+	struct callout		timer;
 	u_int16_t		adapter_type;
 	ips_adapter_info_t	adapter_info;
 	device_t		diskdev[IPS_MAX_NUM_DRIVES];
-- 
2.41.0