Change instances of callout_init that specify MPSAFE behaviour to

use CALLOUT_MPSAFE instead of "1" for the second parameter.  This
does not change the behaviour; it just makes the intent more clear.

6 files changed, 7 insertions, 12 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 7013a6c..dc938fa 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -2289,7 +2289,7 @@ dc_attach(device_t dev)
 	ifp->if_data.ifi_hdrlen = sizeof(struct ether_vlan_header);
 	ifp->if_capabilities |= IFCAP_VLAN_MTU;
 
-	callout_init(&sc->dc_stat_ch, IS_MPSAFE);
+	callout_init(&sc->dc_stat_ch, IS_MPSAFE ? CALLOUT_MPSAFE : 0);
 
 #ifdef SRM_MEDIA
 	sc->dc_srm_media = 0;
diff --git a/sys/dev/hifn/hifn7751.c b/sys/dev/hifn/hifn7751.c
index 4486845..4f787c0 100644
--- a/sys/dev/hifn/hifn7751.c
+++ b/sys/dev/hifn/hifn7751.c
@@ -487,8 +487,7 @@ hifn_attach(device_t dev)
 	if (sc->sc_flags & (HIFN_HAS_PUBLIC | HIFN_HAS_RNG))
 		hifn_init_pubrng(sc);
 
-	/* NB: 1 means the callout runs w/o Giant locked */
-	callout_init(&sc->sc_tickto, 1);
+	callout_init(&sc->sc_tickto, CALLOUT_MPSAFE);
 	callout_reset(&sc->sc_tickto, hz, hifn_tick, sc);
 
 	return (0);
@@ -687,8 +686,7 @@ hifn_init_pubrng(struct hifn_softc *sc)
 			sc->sc_rnghz = hz / 100;
 		else
 			sc->sc_rnghz = 1;
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
 		callout_reset(&sc->sc_rngto, sc->sc_rnghz, hifn_rng, sc);
 	}
 
diff --git a/sys/dev/patm/if_patm_attach.c b/sys/dev/patm/if_patm_attach.c
index 932bb6f..036bc41 100644
--- a/sys/dev/patm/if_patm_attach.c
+++ b/sys/dev/patm/if_patm_attach.c
@@ -204,7 +204,7 @@ patm_attach(device_t dev)
 	mtx_init(&sc->tst_lock, "tst lock", NULL, MTX_DEF);
 	cv_init(&sc->vcc_cv, "vcc_close");
 
-	callout_init(&sc->tst_callout, 1);
+	callout_init(&sc->tst_callout, CALLOUT_MPSAFE);
 
 	sysctl_ctx_init(&sc->sysctl_ctx);
 
diff --git a/sys/dev/rndtest/rndtest.c b/sys/dev/rndtest/rndtest.c
index 15bbc09..5232095 100644
--- a/sys/dev/rndtest/rndtest.c
+++ b/sys/dev/rndtest/rndtest.c
@@ -96,8 +96,7 @@ rndtest_attach(device_t dev)
 #if __FreeBSD_version < 500000
 		callout_init(&rsp->rs_to);
 #else
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&rsp->rs_to, 1);
+		callout_init(&rsp->rs_to, CALLOUT_MPSAFE);
 #endif
 	} else
 		device_printf(dev, "rndtest_init: no memory for state block\n");
diff --git a/sys/dev/safe/safe.c b/sys/dev/safe/safe.c
index 67f9233..ebd170e 100644
--- a/sys/dev/safe/safe.c
+++ b/sys/dev/safe/safe.c
@@ -441,8 +441,7 @@ safe_attach(device_t dev)
 #endif
 		safe_rng_init(sc);
 
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
 		callout_reset(&sc->sc_rngto, hz*safe_rnginterval, safe_rng, sc);
 	}
 #endif /* SAFE_NO_RNG */
diff --git a/sys/dev/ubsec/ubsec.c b/sys/dev/ubsec/ubsec.c
index c9382ba..eb594c9 100644
--- a/sys/dev/ubsec/ubsec.c
+++ b/sys/dev/ubsec/ubsec.c
@@ -462,8 +462,7 @@ ubsec_attach(device_t dev)
 			sc->sc_rnghz = hz / 100;
 		else
 			sc->sc_rnghz = 1;
-		/* NB: 1 means the callout runs w/o Giant locked */
-		callout_init(&sc->sc_rngto, 1);
+		callout_init(&sc->sc_rngto, CALLOUT_MPSAFE);
 		callout_reset(&sc->sc_rngto, sc->sc_rnghz, ubsec_rng, sc);
 skip_rng:
 	;