summaryrefslogtreecommitdiff
path: root/sys/dev/pci/if_sk.c
diff options
context:
space:
mode:
authorBret Lambert <blambert@cvs.openbsd.org>2008-09-10 14:01:24 +0000
committerBret Lambert <blambert@cvs.openbsd.org>2008-09-10 14:01:24 +0000
commit33d64896abc9e79070ec22125a832e7d8ef87878 (patch)
tree1f2297f6ceb3127f1cc36b8d9c89baeeceb16922 /sys/dev/pci/if_sk.c
parent528af50e90df2cf2ebdf638dc4d94752c1861936 (diff)
Convert timeout_add() calls using multiples of hz to timeout_add_sec()
Really just the low-hanging fruit of (hopefully) forthcoming timeout conversions. ok art@, krw@
Diffstat (limited to 'sys/dev/pci/if_sk.c')
-rw-r--r--sys/dev/pci/if_sk.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 96ea5796272..cf48c0597b8 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.146 2008/05/24 01:32:54 brad Exp $ */
+/* $OpenBSD: if_sk.c,v 1.147 2008/09/10 14:01:22 blambert Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -1246,7 +1246,7 @@ sk_attach(struct device *parent, struct device *self, void *aux)
if (SK_IS_GENESIS(sc)) {
timeout_set(&sc_if->sk_tick_ch, sk_tick, sc_if);
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
} else
timeout_set(&sc_if->sk_tick_ch, sk_yukon_tick, sc_if);
@@ -1988,7 +1988,7 @@ sk_tick(void *xsc_if)
}
if (i != 3) {
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
return;
}
@@ -2009,7 +2009,7 @@ sk_yukon_tick(void *xsc_if)
s = splnet();
mii_tick(mii);
splx(s);
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
}
void
@@ -2057,7 +2057,7 @@ sk_intr_bcom(struct sk_if_softc *sc_if)
SK_LINKLED_BLINK_OFF);
} else {
mii_tick(mii);
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
}
}
@@ -2074,11 +2074,11 @@ sk_intr_xmac(struct sk_if_softc *sc_if)
if (sc_if->sk_phytype == SK_PHYTYPE_XMAC) {
if (status & XM_ISR_GP0_SET) {
SK_XM_SETBIT_2(sc_if, XM_IMR, XM_IMR_GP0_SET);
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
}
if (status & XM_ISR_AUTONEG_DONE) {
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
}
}
@@ -2670,7 +2670,7 @@ sk_init(void *xsc_if)
ifp->if_flags &= ~IFF_OACTIVE;
if (SK_IS_YUKON(sc))
- timeout_add(&sc_if->sk_tick_ch, hz);
+ timeout_add_sec(&sc_if->sk_tick_ch, 1);
splx(s);
}