Replace callout_init(..., 1) with callout_init(..., CALLOUT_MPSAFE) for

better grep-compliance and to standardize with the rest of the kernel.

Reviewed by:	       jhb
MFC after:	       1 week

5 files changed, 5 insertions, 5 deletions

diff --git a/sys/dev/ieee488/ibfoo.c b/sys/dev/ieee488/ibfoo.c
index 537443d..f199920 100644
--- a/sys/dev/ieee488/ibfoo.c
+++ b/sys/dev/ieee488/ibfoo.c
@@ -809,7 +809,7 @@ gpib_ib_open(struct cdev *dev, int oflags, int devtype, struct thread *td)
 
 	ib = malloc(sizeof *ib, M_IBFOO, M_WAITOK | M_ZERO);
 	LIST_INIT(&ib->handles);
-	callout_init(&ib->callout, 1);
+	callout_init(&ib->callout, CALLOUT_MPSAFE);
 	ib->unrhdr = new_unrhdr(0, INT_MAX, NULL);
 	dev->si_drv2 = ib;
 	ib->u = u;
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 1528e8a..9393e3a 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -518,7 +518,7 @@ mfi_attach(struct mfi_softc *sc)
 	bus_generic_attach(sc->mfi_dev);
 
 	/* Start the timeout watchdog */
-	callout_init(&sc->mfi_watchdog_callout, 1);
+	callout_init(&sc->mfi_watchdog_callout, CALLOUT_MPSAFE);
 	callout_reset(&sc->mfi_watchdog_callout, MFI_CMD_TIMEOUT * hz,
 	    mfi_timeout, sc);
 
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 14f2212..dfdf969 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -177,7 +177,7 @@ mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr,
 
 	kobj_init((kobj_t)m, cls);
 
-	callout_init(&m->timer, 1);
+	callout_init(&m->timer, CALLOUT_MPSAFE);
 
 	m->si = softintr;
 	m->cookie = cookie;
diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c
index 884333f..463129b 100644
--- a/sys/dev/usb/if_aue.c
+++ b/sys/dev/usb/if_aue.c
@@ -1204,7 +1204,7 @@ aue_init_body(struct aue_softc *sc)
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 
-	callout_init(&sc->aue_tick_callout, 1);
+	callout_init(&sc->aue_tick_callout, CALLOUT_MPSAFE);
 	(void) callout_reset(&sc->aue_tick_callout, hz, aue_tick, sc);
 	return;
 }
diff --git a/sys/netgraph/netflow/ng_netflow.c b/sys/netgraph/netflow/ng_netflow.c
index c67d90b..c813e50 100644
--- a/sys/netgraph/netflow/ng_netflow.c
+++ b/sys/netgraph/netflow/ng_netflow.c
@@ -184,7 +184,7 @@ ng_netflow_constructor(node_p node)
 	priv->info.nfinfo_act_t = ACTIVE_TIMEOUT;
 
 	/* Initialize callout handle */
-	callout_init(&priv->exp_callout, 1);
+	callout_init(&priv->exp_callout, CALLOUT_MPSAFE);
 
 	/* Allocate memory and set up flow cache */
 	if ((error = ng_netflow_cache_init(priv)))