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@

19 files changed, 63 insertions, 63 deletions

diff --git a/sys/dev/bluetooth/bthidev.c b/sys/dev/bluetooth/bthidev.c
index 2ac50931dd6..07dddfa314d 100644
--- a/sys/dev/bluetooth/bthidev.c
+++ b/sys/dev/bluetooth/bthidev.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bthidev.c,v 1.2 2008/02/24 21:46:19 uwe Exp $	*/
+/*	$OpenBSD: bthidev.c,v 1.3 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: bthidev.c,v 1.13 2007/11/12 19:19:32 plunky Exp $	*/
 
 /*-
@@ -658,7 +658,7 @@ bthidev_ctl_disconnected(void *arg, int err)
 		 * Give them a second to do the right thing or let the
 		 * callout handle it.
 		 */
-		timeout_add(&sc->sc_reconnect, hz);
+		timeout_add_sec(&sc->sc_reconnect, 1);
 	}
 }
 
@@ -688,7 +688,7 @@ bthidev_int_disconnected(void *arg, int err)
 		 * The control channel should be closing also, allow
 		 * them a chance to do that before we force it.
 		 */
-		timeout_add(&sc->sc_reconnect, hz);
+		timeout_add_sec(&sc->sc_reconnect, 1);
 	}
 }
 
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 625b96225fd..25875cdc619 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.78 2008/09/01 09:02:59 reyk Exp $  */
+/*      $OpenBSD: ath.c,v 1.79 2008/10/15 19:12:19 blambert Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -2894,7 +2894,7 @@ ath_calibrate(void *arg)
 		    __func__, c->ic_freq));
 		sc->sc_stats.ast_per_calfail++;
 	}
-	timeout_add(&sc->sc_cal_to, hz * ath_calinterval);
+	timeout_add_sec(&sc->sc_cal_to, ath_calinterval);
 	splx(s);
 }
 
@@ -3024,7 +3024,7 @@ ath_newstate(struct ieee80211com *ic, enum ieee80211_state nstate, int arg)
 
 	if (nstate == IEEE80211_S_RUN) {
 		/* start periodic recalibration timer */
-		timeout_add(&sc->sc_cal_to, hz * ath_calinterval);
+		timeout_add_sec(&sc->sc_cal_to, ath_calinterval);
 
 		if (ic->ic_opmode != IEEE80211_M_MONITOR)
 			timeout_add(&sc->sc_rssadapt_to, hz / 10);
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 41271011809..a7f5d403b6f 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.81 2008/08/27 10:03:47 damien Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.82 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -7453,7 +7453,7 @@ back:
 		timeout_add(&sc->sc_scan_ch, (sc->sc_dwell_time * hz) / 1000);
 	} else if (nstate == IEEE80211_S_RUN) {
 		/* XXX 15 seconds */
-		timeout_add(&sc->sc_calib_ch, hz);
+		timeout_add_sec(&sc->sc_calib_ch, 1);
 	}
 
 	return (error);
@@ -9394,7 +9394,7 @@ bwi_calibrate(void *xsc)
 		}
 
 		/* XXX 15 seconds */
-		timeout_add(&sc->sc_calib_ch, hz * 15);
+		timeout_add_sec(&sc->sc_calib_ch, 15);
 	}
 
 	splx(s);
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index 7e9ccbbdcce..0c5119f5edf 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.128 2008/06/08 13:55:06 kettenis Exp $	*/
+/*	$OpenBSD: com.c,v 1.129 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -503,7 +503,7 @@ comclose(dev_t dev, int flag, int mode, struct proc *p)
 		/* tty device is waiting for carrier; drop dtr then re-raise */
 		CLR(sc->sc_mcr, MCR_DTR | MCR_RTS);
 		bus_space_write_1(iot, ioh, com_mcr, sc->sc_mcr);
-		timeout_add(&sc->sc_dtr_tmo, hz * 2);
+		timeout_add_sec(&sc->sc_dtr_tmo, 2);
 	} else {
 		/* no one else waiting; turn off the uart */
 		compwroff(sc);
@@ -1161,7 +1161,7 @@ comintr(void *arg)
 				if (p >= sc->sc_ibufend) {
 					sc->sc_floods++;
 					if (sc->sc_errors++ == 0)
-						timeout_add(&sc->sc_diag_tmo, 60 * hz);
+						timeout_add_sec(&sc->sc_diag_tmo, 60);
 				} else {
 					*p++ = data;
 					*p++ = lsr;
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 232494a990b..b78b6630110 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.105 2008/10/14 18:01:53 naddy Exp $	*/
+/*	$OpenBSD: dc.c,v 1.106 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2897,7 +2897,7 @@ dc_init(void *xsc)
 		if (sc->dc_flags & DC_21143_NWAY)
 			timeout_add(&sc->dc_tick_tmo, hz / 10);
 		else
-			timeout_add(&sc->dc_tick_tmo, hz);
+			timeout_add_sec(&sc->dc_tick_tmo, 1);
 	}
 
 #ifdef SRM_MEDIA
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index bc876e1966c..5712a0c9cc0 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi.c,v 1.141 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_wi.c,v 1.142 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -126,7 +126,7 @@ u_int32_t	widebug = WIDEBUG;
 
 #if !defined(lint) && !defined(__OpenBSD__)
 static const char rcsid[] =
-	"$OpenBSD: if_wi.c,v 1.141 2008/10/02 20:21:13 brad Exp $";
+	"$OpenBSD: if_wi.c,v 1.142 2008/10/15 19:12:19 blambert Exp $";
 #endif	/* lint */
 
 #ifdef foo
@@ -873,7 +873,7 @@ wi_inquire(void *xsc)
 	sc = xsc;
 	ifp = &sc->sc_ic.ic_if;
 
-	timeout_add(&sc->sc_timo, hz * 60);
+	timeout_add_sec(&sc->sc_timo, 60);
 
 	/* Don't do this while we're transmitting */
 	if (ifp->if_flags & IFF_OACTIVE)
@@ -2248,7 +2248,7 @@ wi_init_io(struct wi_softc *sc)
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
 
-	timeout_add(&sc->sc_timo, hz * 60);
+	timeout_add_sec(&sc->sc_timo, 60);
 
 	return;
 }
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index 6a54188a3b6..f944f1ad0c4 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_wi_hostap.c,v 1.40 2007/10/09 17:06:18 gilles Exp $	*/
+/*	$OpenBSD: if_wi_hostap.c,v 1.41 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 2002
@@ -376,7 +376,7 @@ wihap_timeout(void *v)
 			 * until inactivity_time seconds have passed.
 			 */
 			wihap_sta_movetail(whi, sta);
-			timeout_add(&sta->tmo, hz * whi->inactivity_time);
+			timeout_add_sec(&sta->tmo, whi->inactivity_time);
 		} else if (sta->flags & WI_SIFLAGS_AUTHEN) {
 			if (sc->sc_ic.ic_if.if_flags & IFF_DEBUG)
 				printf("wihap_timeout: deauth due to inactivity: %s\n",
@@ -480,7 +480,7 @@ wihap_sta_alloc(struct wi_softc *sc, u_int8_t *addr)
 	whi->n_stations++;
 	bcopy(addr, &sta->addr, ETHER_ADDR_LEN);
 	timeout_set(&sta->tmo, wihap_sta_timeout, sta);
-	timeout_add(&sta->tmo, hz * whi->inactivity_time);
+	timeout_add_sec(&sta->tmo, whi->inactivity_time);
 
 	return (sta);
 }
@@ -616,7 +616,7 @@ wihap_auth_req(struct wi_softc *sc, struct wi_frame *rxfrm,
 			goto fail;
 		}
 	}
-	timeout_add(&sta->tmo, hz * whi->inactivity_time);
+	timeout_add_sec(&sta->tmo, whi->inactivity_time);
 
 	/* Note: it's okay to leave the station info structure around
 	 * if the authen fails.  It'll be timed out eventually.
@@ -829,7 +829,7 @@ wihap_assoc_req(struct wi_softc *sc, struct wi_frame *rxfrm,
 	}
 
 	sta->flags |= WI_SIFLAGS_ASSOC;
-	timeout_add(&sta->tmo, hz * whi->inactivity_time);
+	timeout_add_sec(&sta->tmo, whi->inactivity_time);
 	status = IEEE80211_STATUS_SUCCESS;
 
 fail:
@@ -1052,7 +1052,7 @@ wihap_sta_is_assoc(struct wihap_info *whi, u_int8_t addr[])
 	sta = wihap_sta_find(whi, addr);
 	if (sta != NULL && (sta->flags & WI_SIFLAGS_ASSOC)) {
 		/* Keep it active. */
-		timeout_add(&sta->tmo, hz * whi->inactivity_time);
+		timeout_add_sec(&sta->tmo, whi->inactivity_time);
 		return (1);
 	}
 
@@ -1080,7 +1080,7 @@ wihap_check_tx(struct wihap_info *whi, u_int8_t addr[], u_int8_t *txrate)
 	sta = wihap_sta_find(whi, addr);
 	if (sta != NULL && (sta->flags & WI_SIFLAGS_ASSOC)) {
 		/* Keep it active. */
-		timeout_add(&sta->tmo, hz * whi->inactivity_time);
+		timeout_add_sec(&sta->tmo, whi->inactivity_time);
 		*txrate = txratetable[sta->tx_curr_rate];
 		splx(s);
 		return (1);
@@ -1150,7 +1150,7 @@ wihap_data_input(struct wi_softc *sc, struct wi_frame *rxfrm, struct mbuf *m)
 		return (1);
 	}
 
-	timeout_add(&sta->tmo, hz * whi->inactivity_time);
+	timeout_add_sec(&sta->tmo, whi->inactivity_time);
 	sta->sig_info = letoh16(rxfrm->wi_q_info);
 
 	splx(s);
@@ -1274,7 +1274,7 @@ wihap_ioctl(struct wi_softc *sc, u_long command, caddr_t data)
 		}
 		sta = wihap_sta_alloc(sc, reqsta.addr);
 		sta->flags = reqsta.flags;
-		timeout_add(&sta->tmo, hz * whi->inactivity_time);
+		timeout_add_sec(&sta->tmo, whi->inactivity_time);
 		splx(s);
 		break;
 
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index b732a6aeb8d..8864a834ade 100644
--- a/sys/dev/ic/isp_openbsd.c
+++ b/sys/dev/ic/isp_openbsd.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: isp_openbsd.c,v 1.32 2008/03/19 18:37:20 kettenis Exp $ */
+/* 	$OpenBSD: isp_openbsd.c,v 1.33 2008/10/15 19:12:18 blambert Exp $ */
 /*
  * Platform (OpenBSD) dependent common attachment code for QLogic adapters.
  *
@@ -612,7 +612,7 @@ isp_requeue(void *arg)
 		    (r == CMD_EAGAIN)? "CMD_EAGAIN" : "CMD_RQLATER",
 		    XS_TGT(xs), XS_LUN(xs));
 		timeout_set(&xs->stimeout, isp_requeue, xs);
-		timeout_add(&xs->stimeout, hz);
+		timeout_add_sec(&xs->stimeout, 1);
 		XS_CMD_S_TIMER(xs);
 		break;
 	case CMD_COMPLETE:
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 528a0daf223..b5cde05df53 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.74 2008/06/12 06:58:39 deraadt Exp $	*/
+/*	$OpenBSD: fd.c,v 1.75 2008/10/15 19:12:18 blambert Exp $	*/
 /*	$NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $	*/
 
 /*-
@@ -496,7 +496,7 @@ fdfinish(fd, bp)
 
 	biodone(bp);
 	/* turn off motor 5s from now */
-	timeout_add(&fd->fd_motor_off_to, 5 * hz);
+	timeout_add_sec(&fd->fd_motor_off_to, 5);
 	fdc->sc_state = DEVIDLE;
 }
 
@@ -760,7 +760,7 @@ loop:
 		fd->sc_dk.dk_seek++;
 		disk_busy(&fd->sc_dk);
 
-		timeout_add(&fd->fdtimeout_to, 4 * hz);
+		timeout_add_sec(&fd->fdtimeout_to, 4);
 		return 1;
 
 	case DOIO:
@@ -827,7 +827,7 @@ loop:
 		disk_busy(&fd->sc_dk);
 
 		/* allow 2 seconds for operation */
-		timeout_add(&fd->fdtimeout_to, 2 * hz);
+		timeout_add_sec(&fd->fdtimeout_to, 2);
 		return 1;				/* will return later */
 
 	case SEEKWAIT:
@@ -918,7 +918,7 @@ loop:
 		out_fdc(iot, ioh, NE7CMD_RECAL);	/* recal function */
 		out_fdc(iot, ioh, fd->sc_drive);
 		fdc->sc_state = RECALWAIT;
-		timeout_add(&fd->fdtimeout_to, 5 * hz);
+		timeout_add_sec(&fd->fdtimeout_to, 5);
 		return 1;			/* will return later */
 
 	case RECALWAIT:
diff --git a/sys/dev/isa/gus.c b/sys/dev/isa/gus.c
index 910e108cd96..4fb4f1d61f3 100644
--- a/sys/dev/isa/gus.c
+++ b/sys/dev/isa/gus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gus.c,v 1.31 2008/06/26 05:42:16 ray Exp $	*/
+/*	$OpenBSD: gus.c,v 1.32 2008/10/15 19:12:18 blambert Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -1324,7 +1324,7 @@ gusdmaout(sc, flags, gusaddr, buffaddr, length)
 	/*
 	 * XXX If we don't finish in one second, give up...
 	 */
-	timeout_add(&sc->sc_dma_tmo, hz);
+	timeout_add_sec(&sc->sc_dma_tmo, 1);
 }
 
 /*
diff --git a/sys/dev/isa/nsclpcsio_isa.c b/sys/dev/isa/nsclpcsio_isa.c
index 10772768660..34b5090a247 100644
--- a/sys/dev/isa/nsclpcsio_isa.c
+++ b/sys/dev/isa/nsclpcsio_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nsclpcsio_isa.c,v 1.12 2007/06/01 21:30:31 cnst Exp $ */
+/* $OpenBSD: nsclpcsio_isa.c,v 1.13 2008/10/15 19:12:18 blambert Exp $ */
 /* $NetBSD: nsclpcsio_isa.c,v 1.5 2002/10/22 16:18:26 drochner Exp $ */
 
 /*
@@ -337,7 +337,7 @@ nsclpcsio_isa_attach(struct device *parent, struct device *self, void *aux)
 	sensordev_install(&sc->sensordev);
 	if (sc->sc_ld_en[SIO_LDN_TMS] || sc->sc_ld_en[SIO_LDN_VLM]) {
 		timeout_set(&nsclpcsio_timeout, nsclpcsio_refresh, sc);
-		timeout_add(&nsclpcsio_timeout, (20 * hz) / 10);
+		timeout_add_sec(&nsclpcsio_timeout, 2);
 	}
 
 	/* Attach GPIO framework */
@@ -359,7 +359,7 @@ nsclpcsio_refresh(void *arg)
 		nsclpcsio_tms_update(sc);
 	if (sc->sc_ld_en[SIO_LDN_VLM])
 		nsclpcsio_vlm_update(sc);
-	timeout_add(&nsclpcsio_timeout, (20 * hz) / 10);
+	timeout_add_sec(&nsclpcsio_timeout, 2);
 }
 
 void
diff --git a/sys/dev/pci/if_em.c b/sys/dev/pci/if_em.c
index 0012e3bdb13..541f87f46f2 100644
--- a/sys/dev/pci/if_em.c
+++ b/sys/dev/pci/if_em.c
@@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE.
 
 ***************************************************************************/
 
-/* $OpenBSD: if_em.c,v 1.191 2008/10/05 11:57:48 kettenis Exp $ */
+/* $OpenBSD: if_em.c,v 1.192 2008/10/15 19:12:18 blambert Exp $ */
 /* $FreeBSD: if_em.c,v 1.46 2004/09/29 18:28:28 mlaier Exp $ */
 
 #include <dev/pci/if_em.h>
@@ -768,7 +768,7 @@ em_init(void *arg)
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
 
-	timeout_add(&sc->timer_handle, hz);
+	timeout_add_sec(&sc->timer_handle, 1);
 	em_clear_hw_cntrs(&sc->hw);
 	em_enable_intr(sc);
 
@@ -813,7 +813,7 @@ em_intr(void *arg)
 			sc->hw.get_link_status = 1;
 			em_check_for_link(&sc->hw);
 			em_update_link_status(sc);
-			timeout_add(&sc->timer_handle, hz); 
+			timeout_add_sec(&sc->timer_handle, 1); 
 		}
 
 		if (reg_icr & E1000_ICR_RXO)
@@ -1379,7 +1379,7 @@ em_local_timer(void *arg)
 #endif
 	em_smartspeed(sc);
 
-	timeout_add(&sc->timer_handle, hz);
+	timeout_add_sec(&sc->timer_handle, 1);
 
 	splx(s);
 }
diff --git a/sys/dev/pci/if_nge.c b/sys/dev/pci/if_nge.c
index ef1703a53a9..3ee2a043e6a 100644
--- a/sys/dev/pci/if_nge.c
+++ b/sys/dev/pci/if_nge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_nge.c,v 1.59 2008/10/02 20:21:14 brad Exp $	*/
+/*	$OpenBSD: if_nge.c,v 1.60 2008/10/15 19:12:18 blambert Exp $	*/
 /*
  * Copyright (c) 2001 Wind River Systems
  * Copyright (c) 1997, 1998, 1999, 2000, 2001
@@ -950,7 +950,7 @@ nge_attach(parent, self, aux)
 	ether_ifattach(ifp);
 	DPRINTFN(5, ("%s: timeout_set\n", sc->sc_dv.dv_xname));
 	timeout_set(&sc->nge_timeout, nge_tick, sc);
-	timeout_add(&sc->nge_timeout, hz);
+	timeout_add_sec(&sc->nge_timeout, 1);
 	return;
 
 fail_5:
@@ -1430,7 +1430,7 @@ nge_tick(xsc)
 	DPRINTFN(10, ("%s: nge_tick: link=%d\n", sc->sc_dv.dv_xname,
 		      sc->nge_link));
 
-	timeout_add(&sc->nge_timeout, hz);
+	timeout_add_sec(&sc->nge_timeout, 1);
 	if (sc->nge_link) {
 		splx(s);
 		return;
diff --git a/sys/dev/pci/pccbb.c b/sys/dev/pci/pccbb.c
index c1aad74d16d..267fb19ac28 100644
--- a/sys/dev/pci/pccbb.c
+++ b/sys/dev/pci/pccbb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pccbb.c,v 1.62 2008/09/25 17:54:01 chl Exp $	*/
+/*	$OpenBSD: pccbb.c,v 1.63 2008/10/15 19:12:18 blambert Exp $	*/
 /*	$NetBSD: pccbb.c,v 1.96 2004/03/28 09:49:31 nakayama Exp $	*/
 
 /*
@@ -2626,7 +2626,7 @@ pccbb_pcmcia_poll(arg)
 	u_int32_t spsr;		       /* socket present-state reg */
 
 	timeout_set(&pccbb_poll_timeout, pccbb_pcmcia_poll, arg);
-	timeout_add(&pccbb_poll_timeout, hz * 2);
+	timeout_add_sec(&pccbb_poll_timeout, 2);
 	switch (poll->level) {
 	case IPL_NET:
 		s = splnet();
diff --git a/sys/dev/pci/safe.c b/sys/dev/pci/safe.c
index 3795b067655..3a5bfd46ac1 100644
--- a/sys/dev/pci/safe.c
+++ b/sys/dev/pci/safe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: safe.c,v 1.23 2008/06/09 07:07:16 djm Exp $	*/
+/*	$OpenBSD: safe.c,v 1.24 2008/10/15 19:12:18 blambert Exp $	*/
 
 /*-
  * Copyright (c) 2003 Sam Leffler, Errno Consulting
@@ -302,7 +302,7 @@ safe_attach(struct device *parent, struct device *self, void *aux)
 		safe_rng_init(sc);
 
 		timeout_set(&sc->sc_rngto, safe_rng, sc);
-		timeout_add(&sc->sc_rngto, hz * safe_rnginterval);
+		timeout_add_sec(&sc->sc_rngto, safe_rnginterval);
 	}
 	return;
 
@@ -1257,7 +1257,7 @@ retry:
 	for (i = 0; i < maxwords; i++)
 		add_true_randomness(buf[i]);
 
-	timeout_add(&sc->sc_rngto, hz * safe_rnginterval);
+	timeout_add_sec(&sc->sc_rngto, safe_rnginterval);
 }
 
 /*
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