Second pass of simple timeout_add -> timeout_add_sec conversions

This should take care of the simpler ones (i.e., timeout values of
integer multiples of hz).

ok krw@, art@

4 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/usb/if_ral.c b/sys/dev/usb/if_ral.c
index f84f4ddbbba..fd49d0f6e0b 100644
--- a/sys/dev/usb/if_ral.c
+++ b/sys/dev/usb/if_ral.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ral.c,v 1.108 2008/08/27 10:34:24 damien Exp $	*/
+/*	$OpenBSD: if_ral.c,v 1.109 2008/10/15 19:12:18 blambert Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006
@@ -2145,7 +2145,7 @@ ural_amrr_start(struct ural_softc *sc, struct ieee80211_node *ni)
 	     i--);
 	ni->ni_txrate = i;
 
-	timeout_add(&sc->amrr_to, hz);
+	timeout_add_sec(&sc->amrr_to, 1);
 }
 
 void
@@ -2201,7 +2201,7 @@ ural_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	ieee80211_amrr_choose(&sc->amrr, sc->sc_ic.ic_bss, &sc->amn);
 
-	timeout_add(&sc->amrr_to, hz);
+	timeout_add_sec(&sc->amrr_to, 1);
 }
 
 int
diff --git a/sys/dev/usb/if_rum.c b/sys/dev/usb/if_rum.c
index df53a86dad1..3f491a43df2 100644
--- a/sys/dev/usb/if_rum.c
+++ b/sys/dev/usb/if_rum.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_rum.c,v 1.78 2008/08/27 09:05:03 damien Exp $	*/
+/*	$OpenBSD: if_rum.c,v 1.79 2008/10/15 19:12:18 blambert Exp $	*/
 
 /*-
  * Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -2218,7 +2218,7 @@ rum_amrr_start(struct rum_softc *sc, struct ieee80211_node *ni)
 	     i--);
 	ni->ni_txrate = i;
 
-	timeout_add(&sc->amrr_to, hz);
+	timeout_add_sec(&sc->amrr_to, 1);
 }
 
 void
@@ -2269,7 +2269,7 @@ rum_amrr_update(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	ieee80211_amrr_choose(&sc->amrr, sc->sc_ic.ic_bss, &sc->amn);
 
-	timeout_add(&sc->amrr_to, hz);
+	timeout_add_sec(&sc->amrr_to, 1);
 }
 
 int
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 5b43dcdce37..6955a630625 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_uath.c,v 1.36 2008/09/23 10:47:14 canacar Exp $	*/
+/*	$OpenBSD: if_uath.c,v 1.37 2008/10/15 19:12:18 blambert Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -911,7 +911,7 @@ uath_task(void *arg)
 		    0);
 
 		/* start statistics timer */
-		timeout_add(&sc->stat_to, hz);
+		timeout_add_sec(&sc->stat_to, 1);
 		break;
 	}
 	}
@@ -1163,7 +1163,7 @@ uath_cmd_rxeof(usbd_xfer_handle xfer, usbd_private_handle priv,
 
 	case UATH_NOTIF_STATS:
 		DPRINTFN(2, ("received device statistics\n"));
-		timeout_add(&sc->stat_to, hz);
+		timeout_add_sec(&sc->stat_to, 1);
 		break;
 	}
 
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c
index cc1a3c30a1c..65a823cd054 100644
--- a/sys/dev/usb/if_zyd.c
+++ b/sys/dev/usb/if_zyd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_zyd.c,v 1.71 2008/08/27 09:49:32 damien Exp $	*/
+/*	$OpenBSD: if_zyd.c,v 1.72 2008/10/15 19:12:18 blambert Exp $	*/
 
 /*-
  * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr>
@@ -731,7 +731,7 @@ zyd_task(void *arg)
 
 		/* start automatic rate control timer */
 		if (ic->ic_fixed_rate == -1)
-			timeout_add(&sc->amrr_to, hz);
+			timeout_add_sec(&sc->amrr_to, 1);
 
 		break;
 	}
@@ -2587,7 +2587,7 @@ zyd_amrr_timeout(void *arg)
 		ieee80211_iterate_nodes(ic, zyd_iter_func, sc);
 	splx(s);
 
-	timeout_add(&sc->amrr_to, hz);
+	timeout_add_sec(&sc->amrr_to, 1);
 }
 
 void