From 447ea046b5b4aba425b2879f683099c1cfa3713f Mon Sep 17 00:00:00 2001
From: Bret Lambert <blambert@cvs.openbsd.org>
Date: Wed, 15 Oct 2008 19:12:21 +0000
Subject: 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@
---
 sys/arch/hp300/dev/apci.c       |  6 +++---
 sys/arch/hp300/dev/dma.c        |  6 +++---
 sys/arch/hp300/dev/hd.c         |  4 ++--
 sys/arch/hppa/gsc/gsckbc.c      |  4 ++--
 sys/arch/macppc/dev/if_bm.c     |  4 ++--
 sys/arch/macppc/dev/mesh.c      |  4 ++--
 sys/arch/sgi/dev/if_mec.c       |  6 +++---
 sys/arch/sgi/dev/mkbc.c         | 12 ++++++------
 sys/arch/sh/dev/scif.c          |  4 ++--
 sys/arch/socppc/dev/if_tsec.c   |  6 +++---
 sys/arch/sparc/dev/be.c         |  6 +++---
 sys/arch/sparc/dev/fd.c         | 10 +++++-----
 sys/arch/sparc/dev/z8530kbd.c   |  6 +++---
 sys/arch/sparc/dev/z8530tty.c   |  6 +++---
 sys/arch/sparc64/dev/fd.c       | 12 ++++++------
 sys/arch/sparc64/dev/z8530kbd.c |  6 +++---
 sys/arch/sparc64/dev/z8530tty.c |  6 +++---
 sys/arch/vax/qbus/dz.c          |  6 +++---
 18 files changed, 57 insertions(+), 57 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/hp300/dev/apci.c b/sys/arch/hp300/dev/apci.c
index b470208a919..f15b54817fa 100644
--- a/sys/arch/hp300/dev/apci.c
+++ b/sys/arch/hp300/dev/apci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apci.c,v 1.32 2008/06/26 05:42:10 ray Exp $	*/
+/*	$OpenBSD: apci.c,v 1.33 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: apci.c,v 1.9 2000/11/02 00:35:05 eeh Exp $	*/
 
 /*-
@@ -373,7 +373,7 @@ apciopen(dev, flag, mode, p)
 	if (error == 0) {
 		/* clear errors, start timeout */
 		sc->sc_ferr = sc->sc_perr = sc->sc_oflow = sc->sc_toterr = 0;
-		timeout_add(&sc->sc_timeout, hz);
+		timeout_add_sec(&sc->sc_timeout, 1);
 	}
 
 	return (error);
@@ -860,7 +860,7 @@ apcitimeout(arg)
 		    sc->sc_dev.dv_xname, ferr, perr, oflow, sc->sc_toterr);
 	}
 
-	timeout_add(&sc->sc_timeout, hz);
+	timeout_add_sec(&sc->sc_timeout, 1);
 }
 
 /*
diff --git a/sys/arch/hp300/dev/dma.c b/sys/arch/hp300/dev/dma.c
index 189dfc173ea..33a9551ba68 100644
--- a/sys/arch/hp300/dev/dma.c
+++ b/sys/arch/hp300/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.19 2008/07/18 21:39:52 miod Exp $	*/
+/*	$OpenBSD: dma.c,v 1.20 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: dma.c,v 1.19 1997/05/05 21:02:39 thorpej Exp $	*/
 
 /*
@@ -178,7 +178,7 @@ dmainit()
 #ifdef DEBUG
 	/* make sure timeout is really not needed */
 	timeout_set(&sc->sc_timeout, dmatimeout, sc);
-	timeout_add(&sc->sc_timeout, 30 * hz);
+	timeout_add_sec(&sc->sc_timeout, 30);
 #endif
 
 	printf("98620%c, 2 channels, %d bit DMA\n",
@@ -567,6 +567,6 @@ dmatimeout(void *arg)
 		}
 		splx(s);
 	}
-	timeout_add(&sc->sc_timeout, 30 * hz);
+	timeout_add_sec(&sc->sc_timeout, 30);
 }
 #endif
diff --git a/sys/arch/hp300/dev/hd.c b/sys/arch/hp300/dev/hd.c
index 389d21d4d25..e5e2e2f01ee 100644
--- a/sys/arch/hp300/dev/hd.c
+++ b/sys/arch/hp300/dev/hd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: hd.c,v 1.53 2007/06/21 20:23:07 miod Exp $	*/
+/*	$OpenBSD: hd.c,v 1.54 2008/10/15 19:12:20 blambert Exp $	*/
 /*	$NetBSD: rd.c,v 1.33 1997/07/10 18:14:08 kleink Exp $	*/
 
 /*
@@ -1036,7 +1036,7 @@ hderror(unit)
 		rs->sc_stats.hdtimeouts++;
 #endif
 		hpibfree(rs->sc_dev.dv_parent, &rs->sc_hq);
-		timeout_add(&rs->sc_timeout, hdtimo * hz);
+		timeout_add_sec(&rs->sc_timeout, hdtimo);
 		return(0);
 	}
 	/*
diff --git a/sys/arch/hppa/gsc/gsckbc.c b/sys/arch/hppa/gsc/gsckbc.c
index 0ed5d9b220d..00bd635675e 100644
--- a/sys/arch/hppa/gsc/gsckbc.c
+++ b/sys/arch/hppa/gsc/gsckbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gsckbc.c,v 1.11 2008/07/16 16:32:08 miod Exp $	*/
+/*	$OpenBSD: gsckbc.c,v 1.12 2008/10/15 19:12:19 blambert Exp $	*/
 /*
  * Copyright (c) 2003, Miodrag Vallat.
  * All rights reserved.
@@ -953,7 +953,7 @@ pckbc_enqueue_cmd(self, slot, cmd, len, responselen, sync, respbuf)
 		} else
 			res = nc->status;
 	} else
-		timeout_add(&t->t_cleanup, hz);
+		timeout_add_sec(&t->t_cleanup, 1);
 
 	if (sync) {
 		if (respbuf)
diff --git a/sys/arch/macppc/dev/if_bm.c b/sys/arch/macppc/dev/if_bm.c
index eb0d056eb56..d47a3251c0d 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.23 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_bm.c,v 1.24 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: if_bm.c,v 1.1 1999/01/01 01:27:52 tsubai Exp $	*/
 
 /*-
@@ -982,5 +982,5 @@ bmac_mii_tick(void *v)
 	mii_tick(&sc->sc_mii);
 	splx(s);
 
-	timeout_add(&sc->sc_tick_ch, hz);
+	timeout_add_sec(&sc->sc_tick_ch, 1);
 }
diff --git a/sys/arch/macppc/dev/mesh.c b/sys/arch/macppc/dev/mesh.c
index 9a235810449..3c01138c614 100644
--- a/sys/arch/macppc/dev/mesh.c
+++ b/sys/arch/macppc/dev/mesh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mesh.c,v 1.19 2008/07/30 18:08:03 miod Exp $	*/
+/*	$OpenBSD: mesh.c,v 1.20 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: mesh.c,v 1.1 1999/02/19 13:06:03 tsubai Exp $	*/
 
 /*-
@@ -617,7 +617,7 @@ mesh_select(struct mesh_softc *sc, struct mesh_scb *scb)
 	sc->sc_prevphase = MESH_SELECTING;
 	sc->sc_nextstate = MESH_IDENTIFY;
 
-	timeout_add(&sc->sc_tmo, 10*hz);
+	timeout_add_sec(&sc->sc_tmo, 10);
 }
 
 void
diff --git a/sys/arch/sgi/dev/if_mec.c b/sys/arch/sgi/dev/if_mec.c
index 064543c0f1e..f973bf09cb9 100644
--- a/sys/arch/sgi/dev/if_mec.c
+++ b/sys/arch/sgi/dev/if_mec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_mec.c,v 1.16 2008/10/02 20:21:13 brad Exp $ */
+/*	$OpenBSD: if_mec.c,v 1.17 2008/10/15 19:12:19 blambert Exp $ */
 /*	$NetBSD: if_mec_mace.c,v 1.5 2004/08/01 06:36:36 tsutsui Exp $ */
 
 /*
@@ -679,7 +679,7 @@ mec_init(struct ifnet *ifp)
 	    MEC_DMA_TX_DMA_ENABLE | /* MEC_DMA_TX_INT_ENABLE | */
 	    MEC_DMA_RX_DMA_ENABLE | MEC_DMA_RX_INT_ENABLE);
 
-	timeout_add(&sc->sc_tick_ch, hz);
+	timeout_add_sec(&sc->sc_tick_ch, 1);
 
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
@@ -1131,7 +1131,7 @@ mec_tick(void *arg)
 	mii_tick(&sc->sc_mii);
 	splx(s);
 
-	timeout_add(&sc->sc_tick_ch, hz);
+	timeout_add_sec(&sc->sc_tick_ch, 1);
 }
 
 void
diff --git a/sys/arch/sgi/dev/mkbc.c b/sys/arch/sgi/dev/mkbc.c
index 249a8fba3a2..ca0bfb40f34 100644
--- a/sys/arch/sgi/dev/mkbc.c
+++ b/sys/arch/sgi/dev/mkbc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mkbc.c,v 1.7 2008/06/14 18:29:52 miod Exp $  */
+/*	$OpenBSD: mkbc.c,v 1.8 2008/10/15 19:12:19 blambert Exp $  */
 
 /*
  * Copyright (c) 2006, 2007, Joel Sing
@@ -323,7 +323,7 @@ mkbcintr_internal(struct pckbc_internal *t, struct pckbc_softc *sc)
 
 	/* Reschedule timeout further into the idle times. */
 	if (timeout_pending(&t->t_poll))
-		timeout_add(&t->t_poll, hz);
+		timeout_add_sec(&t->t_poll, 1);
 
 	/*
 	 * Need to check both "slots" since interrupt could be from
@@ -754,7 +754,7 @@ pckbc_enqueue_cmd(pckbc_tag_t self, pckbc_slot_t slot, u_char *cmd, int len,
 		} else
 			res = nc->status;
 	} else
-		timeout_add(&t->t_cleanup, hz);
+		timeout_add_sec(&t->t_cleanup, 1);
 
 	if (sync) {
 		if (respbuf)
@@ -799,7 +799,7 @@ pckbc_set_inputhandler(pckbc_tag_t self, pckbc_slot_t slot, pckbc_inputfcn func,
 	sc->subname[slot] = name;
 
 	if (mkbc_console && slot == PCKBC_KBD_SLOT)
-		timeout_add(&t->t_poll, hz);
+		timeout_add_sec(&t->t_poll, 1);
 }
 
 void
@@ -831,7 +831,7 @@ pckbc_slot_enable(pckbc_tag_t self, pckbc_slot_t slot, int on)
 
 	if (slot == PCKBC_KBD_SLOT) {
 		if (on)
-			timeout_add(&t->t_poll, hz);
+			timeout_add_sec(&t->t_poll, 1);
 		else
 			timeout_del(&t->t_poll);
 	}
@@ -924,6 +924,6 @@ mkbc_poll(void *self)
 
 	s = spltty();
 	(void)mkbcintr_internal(t, t->t_sc);
-	timeout_add(&t->t_poll, hz);
+	timeout_add_sec(&t->t_poll, 1);
 	splx(s);
 }
diff --git a/sys/arch/sh/dev/scif.c b/sys/arch/sh/dev/scif.c
index 30aaec824d0..04aaf0607c1 100644
--- a/sys/arch/sh/dev/scif.c
+++ b/sys/arch/sh/dev/scif.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: scif.c,v 1.6 2008/06/27 06:03:08 ray Exp $	*/
+/*	$OpenBSD: scif.c,v 1.7 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: scif.c,v 1.47 2006/07/23 22:06:06 ad Exp $ */
 
 /*-
@@ -980,7 +980,7 @@ scif_rxsoft(struct scif_softc *sc, struct tty *tp)
 	if (cc == scif_rbuf_size) {
 		sc->sc_floods++;
 		if (sc->sc_errors++ == 0)
-			timeout_add(&sc->sc_diag_tmo, 60 * hz);
+			timeout_add_sec(&sc->sc_diag_tmo, 60);
 	}
 
 	while (cc) {
diff --git a/sys/arch/socppc/dev/if_tsec.c b/sys/arch/socppc/dev/if_tsec.c
index 170eb68e2e4..6ac28f5fd99 100644
--- a/sys/arch/socppc/dev/if_tsec.c
+++ b/sys/arch/socppc/dev/if_tsec.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tsec.c,v 1.12 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: if_tsec.c,v 1.13 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -627,7 +627,7 @@ tsec_tick(void *arg)
 	mii_tick(&sc->sc_mii);
 	splx(s);
 
-	timeout_add(&sc->sc_tick, hz);
+	timeout_add_sec(&sc->sc_tick, 1);
 }
 
 int
@@ -928,7 +928,7 @@ tsec_up(struct tsec_softc *sc)
 	    TSEC_IMASK_TXBEN | TSEC_IMASK_TXFEN |
 	    TSEC_IMASK_RXBEN | TSEC_IMASK_RXFEN);
 
-	timeout_add(&sc->sc_tick, hz);
+	timeout_add_sec(&sc->sc_tick, 1);
 }
 
 void
diff --git a/sys/arch/sparc/dev/be.c b/sys/arch/sparc/dev/be.c
index 9cf5a694449..ed47a39d63a 100644
--- a/sys/arch/sparc/dev/be.c
+++ b/sys/arch/sparc/dev/be.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: be.c,v 1.41 2008/10/02 20:21:13 brad Exp $	*/
+/*	$OpenBSD: be.c,v 1.42 2008/10/15 19:12:19 blambert Exp $	*/
 
 /*
  * Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -557,7 +557,7 @@ betick(vsc)
 	br->lt_ctr = 0;
 	bestart(ifp);
 	splx(s);
-	timeout_add(&sc->sc_tick, hz);
+	timeout_add_sec(&sc->sc_tick, 1);
 }
 
 int
@@ -749,7 +749,7 @@ beinit(sc)
 	ifp->if_flags &= ~IFF_OACTIVE;
 	splx(s);
 
-	timeout_add(&sc->sc_tick, hz);
+	timeout_add_sec(&sc->sc_tick, 1);
 	bestart(ifp);
 }
 
diff --git a/sys/arch/sparc/dev/fd.c b/sys/arch/sparc/dev/fd.c
index 6f0cd599152..1cb6a5c2e34 100644
--- a/sys/arch/sparc/dev/fd.c
+++ b/sys/arch/sparc/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.62 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: fd.c,v 1.63 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: fd.c,v 1.51 1997/05/24 20:16:19 pk Exp $	*/
 
 /*-
@@ -811,7 +811,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;
 }
 
@@ -1359,7 +1359,7 @@ loop:
 		fd->sc_dk.dk_seek++;
 
 		disk_busy(&fd->sc_dk);
-		timeout_add(&fdc->fdctimeout_to, 4 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 4);
 
 		/* specify command */
 		FDC_WRFIFO(fdc, NE7CMD_SPECIFY);
@@ -1421,7 +1421,7 @@ loop:
 		disk_busy(&fd->sc_dk);
 
 		/* allow 3 seconds for operation */
-		timeout_add(&fdc->fdctimeout_to, 3 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 3);
 
 		if (finfo != NULL) {
 			/* formatting */
@@ -1604,7 +1604,7 @@ loop:
 		fdc->sc_state = RECALWAIT;
 		fdc->sc_itask = FDC_ITASK_SENSEI;
 		fdc->sc_nstat = 0;
-		timeout_add(&fdc->fdctimeout_to, 5 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 5);
 		/* recalibrate function */
 		FDC_WRFIFO(fdc, NE7CMD_RECAL);
 		FDC_WRFIFO(fdc, fd->sc_drive);
diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c
index 5c1aff82061..0f275b93c75 100644
--- a/sys/arch/sparc/dev/z8530kbd.c
+++ b/sys/arch/sparc/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.9 2007/05/25 21:27:15 krw Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.10 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -949,7 +949,7 @@ zskbd_rxsoft(zst)
 	if (cc == zskbd_rbuf_size) {
 		zst->zst_floods++;
 		if (zst->zst_errors++ == 0)
-			timeout_add(&zst->zst_diag_ch, 60 * hz);
+			timeout_add_sec(&zst->zst_diag_ch, 60);
 	}
 
 	while (cc) {
@@ -959,7 +959,7 @@ zskbd_rxsoft(zst)
 			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/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c
index 638e423e169..83d7da7d24d 100644
--- a/sys/arch/sparc/dev/z8530tty.c
+++ b/sys/arch/sparc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.9 2008/03/01 17:56:42 kettenis Exp $ */
+/*	$OpenBSD: z8530tty.c,v 1.10 2008/10/15 19:12:19 blambert Exp $ */
 /*	$NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $	*/
 
 /*-
@@ -1463,7 +1463,7 @@ zstty_rxsoft(zst, tp)
 	if (cc == zstty_rbuf_size) {
 		zst->zst_floods++;
 		if (zst->zst_errors++ == 0)
-			timeout_add(&zst->zst_diag_ch, 60 * hz);
+			timeout_add_sec(&zst->zst_diag_ch, 60);
 	}
 
 	/* If not yet open, drop the entire buffer content here */
@@ -1480,7 +1480,7 @@ zstty_rxsoft(zst, 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/arch/sparc64/dev/fd.c b/sys/arch/sparc64/dev/fd.c
index 452e0181d85..4cd37048dcd 100644
--- a/sys/arch/sparc64/dev/fd.c
+++ b/sys/arch/sparc64/dev/fd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fd.c,v 1.25 2008/06/26 05:42:13 ray Exp $	*/
+/*	$OpenBSD: fd.c,v 1.26 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: fd.c,v 1.112 2003/08/07 16:29:35 agc Exp $	*/
 
 /*-
@@ -811,7 +811,7 @@ fdfinish(fd, bp)
 
 	biodone(bp);
 	/* turn off motor 5s from now */
-	timeout_add(&fd->sc_motoroff_to, 5 * hz);
+	timeout_add_sec(&fd->sc_motoroff_to, 5);
 	fdc->sc_state = DEVIDLE;
 }
 
@@ -1373,7 +1373,7 @@ loop:
 		fd->sc_dk.dk_seek++;
 
 		disk_busy(&fd->sc_dk);
-		timeout_add(&fdc->fdctimeout_to, 4 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 4);
 
 		/* specify command */
 		FDC_WRFIFO(fdc, NE7CMD_SPECIFY);
@@ -1395,7 +1395,7 @@ loop:
 		 * followed by a recalibrate.
 		 */
 		disk_busy(&fd->sc_dk);
-		timeout_add(&fdc->fdctimeout_to, 4 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 4);
 		fd->sc_cylin = -1;
 		fdc->sc_nstat = 0;
 		fdc->sc_state = DSKCHGWAIT;
@@ -1476,7 +1476,7 @@ loop:
 		disk_busy(&fd->sc_dk);
 
 		/* allow 3 seconds for operation */
-		timeout_add(&fdc->fdctimeout_to, 3 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 3);
 
 		if (finfo != NULL) {
 			/* formatting */
@@ -1661,7 +1661,7 @@ loop:
 		fdc->sc_state = RECALWAIT;
 		fdc->sc_itask = FDC_ITASK_SENSEI;
 		fdc->sc_nstat = 0;
-		timeout_add(&fdc->fdctimeout_to, 5 * hz);
+		timeout_add_sec(&fdc->fdctimeout_to, 5);
 		/* recalibrate function */
 		FDC_WRFIFO(fdc, NE7CMD_RECAL);
 		FDC_WRFIFO(fdc, fd->sc_drive);
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index 3d4a5ddae06..5610131842a 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530kbd.c,v 1.19 2007/05/25 21:27:15 krw Exp $	*/
+/*	$OpenBSD: z8530kbd.c,v 1.20 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -932,7 +932,7 @@ zskbd_rxsoft(zst)
 	if (cc == zskbd_rbuf_size) {
 		zst->zst_floods++;
 		if (zst->zst_errors++ == 0)
-			timeout_add(&zst->zst_diag_ch, 60 * hz);
+			timeout_add_sec(&zst->zst_diag_ch, 60);
 	}
 
 	while (cc) {
@@ -942,7 +942,7 @@ zskbd_rxsoft(zst)
 			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/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c
index 79622eac199..80a14247bcc 100644
--- a/sys/arch/sparc64/dev/z8530tty.c
+++ b/sys/arch/sparc64/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: z8530tty.c,v 1.14 2008/01/18 21:35:54 kettenis Exp $	*/
+/*	$OpenBSD: z8530tty.c,v 1.15 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $	*/
 
 /*-
@@ -1424,7 +1424,7 @@ zstty_rxsoft(zst, tp)
 	if (cc == zstty_rbuf_size) {
 		zst->zst_floods++;
 		if (zst->zst_errors++ == 0)
-			timeout_add(&zst->zst_diag_ch, 60 * hz);
+			timeout_add_sec(&zst->zst_diag_ch, 60);
 	}
 
 	/* If not yet open, drop the entire buffer content here */
@@ -1441,7 +1441,7 @@ zstty_rxsoft(zst, 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/arch/vax/qbus/dz.c b/sys/arch/vax/qbus/dz.c
index 88f6848cd7e..3ce7edc9313 100644
--- a/sys/arch/vax/qbus/dz.c
+++ b/sys/arch/vax/qbus/dz.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dz.c,v 1.16 2008/08/24 14:51:22 miod Exp $	*/
+/*	$OpenBSD: dz.c,v 1.17 2008/10/15 19:12:19 blambert Exp $	*/
 /*	$NetBSD: dz.c,v 1.23 2000/06/04 02:14:12 matt Exp $	*/
 /*
  * Copyright (c) 1996  Ken C. Wellsch.  All rights reserved.
@@ -134,7 +134,7 @@ dzattach(struct dz_softc *sc)
 	if (dz_timer == 0) {
 		dz_timer = 1;
 		timeout_set(&dz_timeout, dzscan, NULL);
-		timeout_add(&dz_timeout, hz);
+		timeout_add_sec(&dz_timeout, 1);
 	}
 	printf("\n");
 }
@@ -695,7 +695,7 @@ dzscan(void *arg)
 		sc->sc_rxint = 0;
 	}
 	splx(s);
-	timeout_add(&dz_timeout, hz);
+	timeout_add_sec(&dz_timeout, 1);
 }
 
 /*
-- 
cgit v1.2.3