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

---
 sys/dev/netif/ste/if_ste.c    | 12 ++++++------
 sys/dev/netif/ste/if_stereg.h |  4 ++--
 sys/dev/netif/tl/if_tl.c      | 12 +++++-------
 sys/dev/netif/tl/if_tlreg.h   |  4 ++--
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/sys/dev/netif/ste/if_ste.c b/sys/dev/netif/ste/if_ste.c
index df76aeee12..59f786e71d 100644
--- a/sys/dev/netif/ste/if_ste.c
+++ b/sys/dev/netif/ste/if_ste.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.12 2004/07/23 07:16:29 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_ste.c,v 1.13 2004/09/15 00:53:29 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_ste.c,v 1.14.2.9 2003/02/05 22:03:57 mbr Exp $
  */
@@ -653,7 +653,7 @@ static void ste_intr(xsc)
 			ste_txeoc(sc);
 
 		if (status & STE_ISR_STATS_OFLOW) {
-			untimeout(ste_stats_update, sc, sc->ste_stat_ch);
+			callout_stop(&sc->ste_stat_timer);
 			ste_stats_update(sc);
 		}
 
@@ -861,7 +861,7 @@ static void ste_stats_update(xsc)
 		}
 	}
 
-	sc->ste_stat_ch = timeout(ste_stats_update, sc, hz);
+	callout_reset(&sc->ste_stat_timer, hz, ste_stats_update, sc);
 	splx(s);
 
 	return;
@@ -1005,7 +1005,7 @@ static int ste_attach(dev)
 		goto fail;
 	}
 
-	callout_handle_init(&sc->ste_stat_ch);
+	callout_init(&sc->ste_stat_timer);
 
 	/* Reset the adapter. */
 	ste_reset(sc);
@@ -1319,7 +1319,7 @@ static void ste_init(xsc)
 
 	splx(s);
 
-	sc->ste_stat_ch = timeout(ste_stats_update, sc, hz);
+	callout_reset(&sc->ste_stat_timer, hz, ste_stats_update, sc);
 
 	return;
 }
@@ -1332,7 +1332,7 @@ static void ste_stop(sc)
 
 	ifp = &sc->arpcom.ac_if;
 
-	untimeout(ste_stats_update, sc, sc->ste_stat_ch);
+	callout_stop(&sc->ste_stat_timer);
 
 	CSR_WRITE_2(sc, STE_IMR, 0);
 	STE_SETBIT2(sc, STE_MACCTL1, STE_MACCTL1_TX_DISABLE);
diff --git a/sys/dev/netif/ste/if_stereg.h b/sys/dev/netif/ste/if_stereg.h
index 8c3550dca3..62a27529e1 100644
--- a/sys/dev/netif/ste/if_stereg.h
+++ b/sys/dev/netif/ste/if_stereg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_stereg.h,v 1.5.2.3 2002/08/21 15:26:01 ambrisko Exp $
- * $DragonFly: src/sys/dev/netif/ste/if_stereg.h,v 1.2 2003/06/17 04:28:57 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/ste/if_stereg.h,v 1.3 2004/09/15 00:53:29 joerg Exp $
  */
 
 /*
@@ -524,7 +524,7 @@ struct ste_softc {
 	int			ste_tx_prev_idx;
 	struct ste_list_data	*ste_ldata;
 	struct ste_chain_data	ste_cdata;
-	struct callout_handle	ste_stat_ch;
+	struct callout		ste_stat_timer;
 	u_int8_t		ste_one_phy;
 };
 
diff --git a/sys/dev/netif/tl/if_tl.c b/sys/dev/netif/tl/if_tl.c
index 9eaff765e9..44aeb31d8a 100644
--- a/sys/dev/netif/tl/if_tl.c
+++ b/sys/dev/netif/tl/if_tl.c
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.12 2004/07/23 07:16:29 joerg Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tl.c,v 1.13 2004/09/15 00:55:37 joerg Exp $
  *
  * $FreeBSD: src/sys/pci/if_tl.c,v 1.51.2.5 2001/12/16 15:46:08 luigi Exp $
  */
@@ -1295,7 +1295,7 @@ static int tl_attach(dev)
 	ifp->if_init = tl_init;
 	ifp->if_mtu = ETHERMTU;
 	ifp->if_snd.ifq_maxlen = TL_TX_LIST_CNT - 1;
-	callout_handle_init(&sc->tl_stat_ch);
+	callout_init(&sc->tl_stat_timer);
 
 	/* Reset the adapter again. */
 	tl_softreset(sc, 1);
@@ -1812,7 +1812,7 @@ static void tl_stats_update(xsc)
 		}
 	}
 
-	sc->tl_stat_ch = timeout(tl_stats_update, sc, hz);
+	callout_reset(&sc->tl_stat_timer, hz, tl_stats_update, sc);
 
 	if (!sc->tl_bitrate) {
 		mii = device_get_softc(sc->tl_miibus);
@@ -2095,9 +2095,7 @@ static void tl_init(xsc)
 	(void)splx(s);
 
 	/* Start the stats update counter */
-	sc->tl_stat_ch = timeout(tl_stats_update, sc, hz);
-
-	return;
+	callout_reset(&sc->tl_stat_timer, hz, tl_stats_update, sc);
 }
 
 /*
@@ -2251,7 +2249,7 @@ static void tl_stop(sc)
 	ifp = &sc->arpcom.ac_if;
 
 	/* Stop the stats updater. */
-	untimeout(tl_stats_update, sc, sc->tl_stat_ch);
+	callout_stop(&sc->tl_stat_timer);
 
 	/* Stop the transmitter */
 	CMD_CLR(sc, TL_CMD_RT);
diff --git a/sys/dev/netif/tl/if_tlreg.h b/sys/dev/netif/tl/if_tlreg.h
index 0fb9cdbba0..14cb58026e 100644
--- a/sys/dev/netif/tl/if_tlreg.h
+++ b/sys/dev/netif/tl/if_tlreg.h
@@ -30,7 +30,7 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/pci/if_tlreg.h,v 1.15 1999/09/19 22:39:24 wpaul Exp $
- * $DragonFly: src/sys/dev/netif/tl/if_tlreg.h,v 1.2 2003/06/17 04:28:57 dillon Exp $
+ * $DragonFly: src/sys/dev/netif/tl/if_tlreg.h,v 1.3 2004/09/15 00:55:37 joerg Exp $
  */
 
 
@@ -126,7 +126,7 @@ struct tl_softc {
 	u_int8_t		tl_txeoc;
 	u_int8_t		tl_bitrate;
 	int			tl_if_flags;
-	struct callout_handle	tl_stat_ch;
+	struct callout		tl_stat_timer;
 };
 
 /*
-- 
2.41.0