Actual final round of timeout_add(to, n * hz) -> timeout_add_sec(to, n)

conversions.

ok kettenis@
ok krw@ (possibly for the second time :)

10 files changed, 20 insertions, 20 deletions

diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c
index a0554a5d597..6104c987831 100644
--- a/sys/arch/hp300/dev/mt.c
+++ b/sys/arch/hp300/dev/mt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mt.c,v 1.21 2008/06/12 06:58:33 deraadt Exp $	*/
+/*	$OpenBSD: mt.c,v 1.22 2009/01/11 16:54:59 blambert Exp $	*/
 /*	$NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $	*/
 
 /*
@@ -656,7 +656,7 @@ mtstart(arg)
 				    sc->sc_dev.dv_xname);
 				goto fatalerror;
 			}
-			timeout_add(&sc->sc_intr_to, 4 * hz);
+			timeout_add_sec(&sc->sc_intr_to, 4);
 			hpibawait(sc->sc_hpibno);
 			return;
 
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index 26471c4e44c..ad4cab124f1 100644
--- a/sys/arch/macppc/dev/if_bm.c
+++ b/sys/arch/macppc/dev/if_bm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_bm.c,v 1.25 2008/11/28 02:44:17 brad Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.26 2009/01/11 16:54:59 blambert Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -435,7 +435,7 @@ bmac_init(struct bmac_softc *sc)
 
 	bmac_start(ifp);
 
-	timeout_add(&sc->sc_tick_ch, hz);
+	timeout_add_sec(&sc->sc_tick_ch, 1);
 }
 
 void
diff --git a/sys/arch/macppc/dev/z8530tty.c b/sys/arch/macppc/dev/z8530tty.c
index 1bffdce0ff9..f9f6a33b4c6 100644
--- a/sys/arch/macppc/dev/z8530tty.c
+++ b/sys/arch/macppc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.7 2008/03/01 19:17:03 kettenis Exp $ */
+/*	$OpenBSD: z8530tty.c,v 1.8 2009/01/11 16:54:59 blambert Exp $ */
 /*	$NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $	*/
 
 /*-
@@ -1431,7 +1431,7 @@ zstty_rxsoft(struct zstty_softc *zst, struct tty *tp)
 			if (ISSET(rr1, ZSRR1_DO)) {
 				zst->zst_overflows++;
 				if (zst->zst_errors++ == 0)
-					timeout_add(&zst->zst_diag_ch, 60 * hz);
+					timeout_add_sec(&zst->zst_diag_ch, 60);
 			}
 			if (ISSET(rr1, ZSRR1_FE))
 				SET(code, TTY_FE);
diff --git a/sys/dev/eisa/aha1742.c b/sys/dev/eisa/aha1742.c
index 8283321afc9..e45e16209be 100644
--- a/sys/dev/eisa/aha1742.c
+++ b/sys/dev/eisa/aha1742.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha1742.c,v 1.28 2008/11/25 17:52:02 krw Exp $	*/
+/*	$OpenBSD: aha1742.c,v 1.29 2009/01/11 16:54:59 blambert Exp $	*/
 /*	$NetBSD: aha1742.c,v 1.61 1996/05/12 23:40:01 mycroft Exp $	*/
 
 /*
@@ -1165,7 +1165,7 @@ ahb_timeout(arg)
 		ahb_send_mbox(sc, OP_ABORT_ECB, ecb);
 		/* 2 secs for the abort */
 		if ((xs->flags & SCSI_POLL) == 0)
-			timeout_add(&ecb->xs->stimeout, 2 * hz);
+			timeout_add_sec(&ecb->xs->stimeout, 2);
 	}
 
 	splx(s);
diff --git a/sys/dev/ic/ami.c b/sys/dev/ic/ami.c
index 712e007e50f..4542d286d96 100644
--- a/sys/dev/ic/ami.c
+++ b/sys/dev/ic/ami.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ami.c,v 1.190 2008/10/28 11:53:18 marco Exp $	*/
+/*	$OpenBSD: ami.c,v 1.191 2009/01/11 16:54:59 blambert Exp $	*/
 
 /*
  * Copyright (c) 2001 Michael Shalayeff
@@ -978,7 +978,7 @@ ami_start_xs(struct ami_softc *sc, struct ami_ccb *ccb, struct scsi_xfer *xs)
 	}
 
 	/* XXX way wrong, this timeout needs to be set later */
-	timeout_add(&xs->stimeout, 61 * hz);
+	timeout_add_sec(&xs->stimeout, 61);
 	ami_start(sc, ccb);
 
 	return (SUCCESSFULLY_QUEUED);
diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c
index bc0da3fc5ec..1d965c9017d 100644
--- a/sys/dev/ic/com.c
+++ b/sys/dev/ic/com.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: com.c,v 1.130 2008/11/23 17:59:00 deraadt Exp $	*/
+/*	$OpenBSD: com.c,v 1.131 2009/01/11 16:54:59 blambert Exp $	*/
 /*	$NetBSD: com.c,v 1.82.4.1 1996/06/02 09:08:00 mrg Exp $	*/
 
 /*
@@ -1048,7 +1048,7 @@ comsoft(void *arg)
 		if (ISSET(*ibufp, LSR_OE)) {
 			sc->sc_overflows++;
 			if (sc->sc_errors++ == 0)
-				timeout_add(&sc->sc_diag_tmo, 60 * hz);
+				timeout_add_sec(&sc->sc_diag_tmo, 60);
 		}
 		/* This is ugly, but fast. */
 		c |= lsrmap[(*ibufp++ & (LSR_BI|LSR_FE|LSR_PE)) >> 2];
diff --git a/sys/dev/ic/dc.c b/sys/dev/ic/dc.c
index 61ab4a56285..c3e36634817 100644
--- a/sys/dev/ic/dc.c
+++ b/sys/dev/ic/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.107 2008/11/28 02:44:17 brad Exp $	*/
+/*	$OpenBSD: dc.c,v 1.108 2009/01/11 16:54:59 blambert Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -2398,7 +2398,7 @@ dc_tick(void *xsc)
 	if (sc->dc_flags & DC_21143_NWAY && !sc->dc_link)
 		timeout_add(&sc->dc_tick_tmo, hz / 10);
 	else
-		timeout_add(&sc->dc_tick_tmo, hz);
+		timeout_add_sec(&sc->dc_tick_tmo, 1);
 
 	splx(s);
 }
diff --git a/sys/dev/ic/isp_openbsd.c b/sys/dev/ic/isp_openbsd.c
index 8864a834ade..c744900b145 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.33 2008/10/15 19:12:18 blambert Exp $ */
+/* 	$OpenBSD: isp_openbsd.c,v 1.34 2009/01/11 16:54:59 blambert Exp $ */
 /*
  * Platform (OpenBSD) dependent common attachment code for QLogic adapters.
  *
@@ -374,7 +374,7 @@ ispcmd(XS_T *xs)
 		isp_prt(isp, ISP_LOGDEBUG1, "retrying later for %d.%d",
 		    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/seagate.c b/sys/dev/isa/seagate.c
index 0be76d20b9d..c5a060e494d 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: seagate.c,v 1.24 2008/11/25 17:52:02 krw Exp $	*/
+/*	$OpenBSD: seagate.c,v 1.25 2009/01/11 16:54:59 blambert Exp $	*/
 
 /*
  * ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -813,7 +813,7 @@ sea_timeout(void *arg)
 		/* 2 secs for the abort */
 		if ((xs->flags & SCSI_POLL) == 0) {
 			timeout_set(&scb->xs->stimeout, sea_timeout, scb);
-			timeout_add(&scb->xs->stimeout, 2 * hz);
+			timeout_add_sec(&scb->xs->stimeout, 2);
 		}
 	}
 
diff --git a/sys/dev/pci/cz.c b/sys/dev/pci/cz.c
index 2776c396f31..6a057aa6c32 100644
--- a/sys/dev/pci/cz.c
+++ b/sys/dev/pci/cz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cz.c,v 1.10 2007/10/06 23:50:54 krw Exp $ */
+/*	$OpenBSD: cz.c,v 1.11 2009/01/11 16:54:59 blambert Exp $ */
 /*	$NetBSD: cz.c,v 1.15 2001/01/20 19:10:36 thorpej Exp $	*/
 
 /*-
@@ -785,7 +785,7 @@ cz_intr(void *arg)
 			sc->sc_overflows++;
  error_common:
 			if (sc->sc_errors++ == 0)
-				timeout_add(&sc->sc_diag_to, 60 * hz);
+				timeout_add_sec(&sc->sc_diag_to, 60);
 			break;
 
 		case C_CM_RXBRK: