Module Name: src
Committed By: thorpej
Date: Fri Feb 7 00:56:49 UTC 2020
Modified Files:
src/sys/dev/ic: aic6915.c elinkxl.c gem.c hme.c i82557.c rtl8169.c
rtl81x9.c smc83c170.c smc91cxx.c
Log Message:
Use callout_setfunc() / callout_schedule().
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/dev/ic/aic6915.c
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/ic/elinkxl.c
cvs rdiff -u -r1.127 -r1.128 src/sys/dev/ic/gem.c
cvs rdiff -u -r1.106 -r1.107 src/sys/dev/ic/hme.c
cvs rdiff -u -r1.158 -r1.159 src/sys/dev/ic/i82557.c
cvs rdiff -u -r1.163 -r1.164 src/sys/dev/ic/rtl8169.c
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/rtl81x9.c
cvs rdiff -u -r1.92 -r1.93 src/sys/dev/ic/smc83c170.c
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/ic/smc91cxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/aic6915.c
diff -u src/sys/dev/ic/aic6915.c:1.41 src/sys/dev/ic/aic6915.c:1.42
--- src/sys/dev/ic/aic6915.c:1.41 Wed Jan 29 14:09:58 2020
+++ src/sys/dev/ic/aic6915.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: aic6915.c,v 1.41 2020/01/29 14:09:58 thorpej Exp $ */
+/* $NetBSD: aic6915.c,v 1.42 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.41 2020/01/29 14:09:58 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aic6915.c,v 1.42 2020/02/07 00:56:48 thorpej Exp $");
#include <sys/param.h>
@@ -143,6 +143,7 @@ sf_attach(struct sf_softc *sc)
uint8_t enaddr[ETHER_ADDR_LEN];
callout_init(&sc->sc_tick_callout, 0);
+ callout_setfunc(&sc->sc_tick_callout, sf_tick, sc);
/*
* If we're I/O mapped, the functional register handle is
@@ -823,7 +824,7 @@ sf_tick(void *arg)
sf_stats_update(sc);
splx(s);
- callout_reset(&sc->sc_tick_callout, hz, sf_tick, sc);
+ callout_schedule(&sc->sc_tick_callout, hz);
}
/*
@@ -1088,7 +1089,7 @@ sf_init(struct ifnet *ifp)
GEC_TxDmaEn | GEC_RxDmaEn | GEC_TransmitEn | GEC_ReceiveEn);
/* Start the on second clock. */
- callout_reset(&sc->sc_tick_callout, hz, sf_tick, sc);
+ callout_schedule(&sc->sc_tick_callout, hz);
/*
* Note that the interface is now running.
Index: src/sys/dev/ic/elinkxl.c
diff -u src/sys/dev/ic/elinkxl.c:1.135 src/sys/dev/ic/elinkxl.c:1.136
--- src/sys/dev/ic/elinkxl.c:1.135 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/elinkxl.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.135 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: elinkxl.c,v 1.136 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.135 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elinkxl.c,v 1.136 2020/02/07 00:56:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -176,6 +176,7 @@ ex_config(struct ex_softc *sc)
pmf_self_suspensor_init(sc->sc_dev, &sc->sc_suspensor, &sc->sc_qual);
callout_init(&sc->ex_mii_callout, 0);
+ callout_setfunc(&sc->ex_mii_callout, ex_tick, sc);
ex_reset(sc);
@@ -688,7 +689,7 @@ ex_init(struct ifnet *ifp)
GO_WINDOW(1);
- callout_reset(&sc->ex_mii_callout, hz, ex_tick, sc);
+ callout_schedule(&sc->ex_mii_callout, hz);
out:
if (error) {
@@ -1546,7 +1547,7 @@ ex_tick(void *arg)
splx(s);
- callout_reset(&sc->ex_mii_callout, hz, ex_tick, sc);
+ callout_schedule(&sc->ex_mii_callout, hz);
}
void
Index: src/sys/dev/ic/gem.c
diff -u src/sys/dev/ic/gem.c:1.127 src/sys/dev/ic/gem.c:1.128
--- src/sys/dev/ic/gem.c:1.127 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/gem.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gem.c,v 1.127 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: gem.c,v 1.128 2020/02/07 00:56:48 thorpej Exp $ */
/*
*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.127 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gem.c,v 1.128 2020/02/07 00:56:48 thorpej Exp $");
#include "opt_inet.h"
@@ -616,6 +616,8 @@ gem_attach(struct gem_softc *sc, const u
#endif
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, gem_tick, sc);
+
callout_init(&sc->sc_rx_watchdog, 0);
callout_setfunc(&sc->sc_rx_watchdog, gem_rx_watchdog, sc);
@@ -641,7 +643,7 @@ gem_tick(void *arg)
s = splnet();
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, gem_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
}
@@ -1062,7 +1064,7 @@ gem_pcs_start(struct gem_softc *sc)
gem_bitwait(sc, h, GEM_MII_STATUS, 0, GEM_MII_STATUS_ANEG_CPT);
/* Start the 10 second timer */
- callout_reset(&sc->sc_tick_ch, hz * 10, gem_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz * 10);
}
/*
@@ -1221,7 +1223,7 @@ gem_init(struct ifnet *ifp)
gem_pcs_start(sc);
else
/* Start the one second timer. */
- callout_reset(&sc->sc_tick_ch, hz, gem_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
sc->sc_flags &= ~GEM_LINK;
ifp->if_flags |= IFF_RUNNING;
@@ -2163,7 +2165,7 @@ gem_pint(struct gem_softc *sc)
gem_statuschange(sc);
/* Start the 10 second timer */
- callout_reset(&sc->sc_tick_ch, hz * 10, gem_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz * 10);
}
return 1;
}
Index: src/sys/dev/ic/hme.c
diff -u src/sys/dev/ic/hme.c:1.106 src/sys/dev/ic/hme.c:1.107
--- src/sys/dev/ic/hme.c:1.106 Wed Jan 29 14:47:08 2020
+++ src/sys/dev/ic/hme.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: hme.c,v 1.106 2020/01/29 14:47:08 thorpej Exp $ */
+/* $NetBSD: hme.c,v 1.107 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.106 2020/01/29 14:47:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.107 2020/02/07 00:56:48 thorpej Exp $");
/* #define HMEDEBUG */
@@ -315,6 +315,7 @@ hme_config(struct hme_softc *sc)
RND_TYPE_NET, RND_FLAG_DEFAULT);
callout_init(&sc->sc_tick_ch, 0);
+ callout_setfunc(&sc->sc_tick_ch, hme_tick, sc);
}
void
@@ -327,7 +328,7 @@ hme_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
}
void
@@ -635,7 +636,7 @@ hme_init(struct ifnet *ifp)
return rc;
/* Start the one second timer. */
- callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc);
+ callout_schedule(&sc->sc_tick_ch, hz);
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
Index: src/sys/dev/ic/i82557.c
diff -u src/sys/dev/ic/i82557.c:1.158 src/sys/dev/ic/i82557.c:1.159
--- src/sys/dev/ic/i82557.c:1.158 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/i82557.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.158 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: i82557.c,v 1.159 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001, 2002 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.158 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i82557.c,v 1.159 2020/02/07 00:56:48 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -260,6 +260,7 @@ fxp_attach(struct fxp_softc *sc)
struct fxp_phytype *fp;
callout_init(&sc->sc_callout, 0);
+ callout_setfunc(&sc->sc_callout, fxp_tick, sc);
/*
* Enable use of extended RFDs and IPCBs for 82550 and later chips.
@@ -1566,7 +1567,7 @@ fxp_tick(void *arg)
/*
* Schedule another timeout one second from now.
*/
- callout_reset(&sc->sc_callout, hz, fxp_tick, sc);
+ callout_schedule(&sc->sc_callout, hz);
}
/*
@@ -2006,7 +2007,7 @@ fxp_init(struct ifnet *ifp)
/*
* Start the one second timer.
*/
- callout_reset(&sc->sc_callout, hz, fxp_tick, sc);
+ callout_schedule(&sc->sc_callout, hz);
/*
* Attempt to start output on the interface.
Index: src/sys/dev/ic/rtl8169.c
diff -u src/sys/dev/ic/rtl8169.c:1.163 src/sys/dev/ic/rtl8169.c:1.164
--- src/sys/dev/ic/rtl8169.c:1.163 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/rtl8169.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl8169.c,v 1.163 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: rtl8169.c,v 1.164 2020/02/07 00:56:48 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998-2003
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.163 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.164 2020/02/07 00:56:48 thorpej Exp $");
/* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */
/*
@@ -873,6 +873,7 @@ re_attach(struct rtk_softc *sc)
IFQ_SET_READY(&ifp->if_snd);
callout_init(&sc->rtk_tick_ch, 0);
+ callout_setfunc(&sc->rtk_tick_ch, re_tick, sc);
/* Do MII setup */
mii->mii_ifp = ifp;
@@ -1470,7 +1471,7 @@ re_tick(void *arg)
mii_tick(&sc->mii);
splx(s);
- callout_reset(&sc->rtk_tick_ch, hz, re_tick, sc);
+ callout_schedule(&sc->rtk_tick_ch, hz);
}
int
@@ -2031,7 +2032,7 @@ re_init(struct ifnet *ifp)
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
- callout_reset(&sc->rtk_tick_ch, hz, re_tick, sc);
+ callout_schedule(&sc->rtk_tick_ch, hz);
out:
if (error) {
Index: src/sys/dev/ic/rtl81x9.c
diff -u src/sys/dev/ic/rtl81x9.c:1.109 src/sys/dev/ic/rtl81x9.c:1.110
--- src/sys/dev/ic/rtl81x9.c:1.109 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/rtl81x9.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rtl81x9.c,v 1.109 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: rtl81x9.c,v 1.110 2020/02/07 00:56:48 thorpej Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -86,7 +86,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.109 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtl81x9.c,v 1.110 2020/02/07 00:56:48 thorpej Exp $");
#include <sys/param.h>
@@ -627,6 +627,7 @@ rtk_attach(struct rtk_softc *sc)
int i, addr_len;
callout_init(&sc->rtk_tick_ch, 0);
+ callout_setfunc(&sc->rtk_tick_ch, rtk_tick, sc);
/*
* Check EEPROM type 9346 or 9356.
@@ -1421,7 +1422,7 @@ rtk_init(struct ifnet *ifp)
ifp->if_flags |= IFF_RUNNING;
ifp->if_flags &= ~IFF_OACTIVE;
- callout_reset(&sc->rtk_tick_ch, hz, rtk_tick, sc);
+ callout_schedule(&sc->rtk_tick_ch, hz);
out:
if (error) {
@@ -1514,5 +1515,5 @@ rtk_tick(void *arg)
mii_tick(&sc->mii);
splx(s);
- callout_reset(&sc->rtk_tick_ch, hz, rtk_tick, sc);
+ callout_schedule(&sc->rtk_tick_ch, hz);
}
Index: src/sys/dev/ic/smc83c170.c
diff -u src/sys/dev/ic/smc83c170.c:1.92 src/sys/dev/ic/smc83c170.c:1.93
--- src/sys/dev/ic/smc83c170.c:1.92 Thu Jan 30 04:56:11 2020
+++ src/sys/dev/ic/smc83c170.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170.c,v 1.92 2020/01/30 04:56:11 thorpej Exp $ */
+/* $NetBSD: smc83c170.c,v 1.93 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.92 2020/01/30 04:56:11 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc83c170.c,v 1.93 2020/02/07 00:56:48 thorpej Exp $");
#include <sys/param.h>
@@ -113,6 +113,7 @@ epic_attach(struct epic_softc *sc)
char *nullbuf;
callout_init(&sc->sc_mii_callout, 0);
+ callout_setfunc(&sc->sc_mii_callout, epic_tick, sc);
/*
* Allocate the control data structures, and create and load the
@@ -846,7 +847,7 @@ epic_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_mii_callout, hz, epic_tick, sc);
+ callout_schedule(&sc->sc_mii_callout, hz);
}
/*
@@ -1037,7 +1038,7 @@ epic_init(struct ifnet *ifp)
/*
* Start the one second clock.
*/
- callout_reset(&sc->sc_mii_callout, hz, epic_tick, sc);
+ callout_schedule(&sc->sc_mii_callout, hz);
/*
* Attempt to start output on the interface.
Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.105 src/sys/dev/ic/smc91cxx.c:1.106
--- src/sys/dev/ic/smc91cxx.c:1.105 Tue Feb 4 05:25:39 2020
+++ src/sys/dev/ic/smc91cxx.c Fri Feb 7 00:56:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.105 2020/02/04 05:25:39 thorpej Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.106 2020/02/07 00:56:48 thorpej Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.105 2020/02/04 05:25:39 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smc91cxx.c,v 1.106 2020/02/07 00:56:48 thorpej Exp $");
#include "opt_inet.h"
@@ -381,6 +381,7 @@ smc91cxx_attach(struct smc91cxx_softc *s
RND_TYPE_NET, RND_FLAG_DEFAULT);
callout_init(&sc->sc_mii_callout, 0);
+ callout_setfunc(&sc->sc_mii_callout, smc91cxx_tick, sc);
/* The attach is successful. */
sc->sc_flags |= SMC_FLAGS_ATTACHED;
@@ -593,7 +594,7 @@ smc91cxx_init(struct smc91cxx_softc *sc)
if (sc->sc_flags & SMC_FLAGS_HAS_MII) {
/* Start the one second clock. */
- callout_reset(&sc->sc_mii_callout, hz, smc91cxx_tick, sc);
+ callout_schedule(&sc->sc_mii_callout, hz);
}
/* Attempt to start any pending transmission. */
@@ -1486,5 +1487,5 @@ smc91cxx_tick(void *arg)
mii_tick(&sc->sc_mii);
splx(s);
- callout_reset(&sc->sc_mii_callout, hz, smc91cxx_tick, sc);
+ callout_schedule(&sc->sc_mii_callout, hz);
}
