diff --git a/sys/dev/sound/dummy.c b/sys/dev/sound/dummy.c
--- a/sys/dev/sound/dummy.c
+++ b/sys/dev/sound/dummy.c
@@ -394,8 +394,7 @@
 	 */
 	make_dev_alias(sc->info.dsp_dev, "dsp.dummy");
 
-	sc->mpu = mpu401_init(&dummy_mpu_class, sc, dummy_chan_io,
-	    &sc->mpu_intr);
+	sc->mpu = mpu401_init(&dummy_mpu_class, sc, &sc->mpu_intr);
 	if (sc->mpu == NULL)
 		return (ENXIO);
 
diff --git a/sys/dev/sound/midi/mpu401.h b/sys/dev/sound/midi/mpu401.h
--- a/sys/dev/sound/midi/mpu401.h
+++ b/sys/dev/sound/midi/mpu401.h
@@ -34,8 +34,7 @@
 typedef int mpu401_intr_t(struct mpu401 *_obj);
 
 extern struct mpu401 *
-mpu401_init(kobj_class_t _cls, void *cookie, driver_intr_t *_softintr,
-    mpu401_intr_t ** _cb);
+mpu401_init(kobj_class_t _cls, void *cookie, mpu401_intr_t **_cb);
 extern int mpu401_uninit(struct mpu401 *_obj);
 
 #endif
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -203,8 +203,7 @@
 }
 
 struct mpu401 *
-mpu401_init(kobj_class_t cls, void *cookie, driver_intr_t softintr,
-    mpu401_intr_t ** cb)
+mpu401_init(kobj_class_t cls, void *cookie, mpu401_intr_t **cb)
 {
 	struct mpu401 *m;
 
diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
--- a/sys/dev/sound/pci/cmi.c
+++ b/sys/dev/sound/pci/cmi.c
@@ -834,7 +834,7 @@
 	cmi_set4(sc, CMPCI_REG_LEGACY_CTRL, 
 			0 << CMPCI_REG_VMPUSEL_SHIFT );
 	cmi_set4(sc, CMPCI_REG_FUNC_1, CMPCI_REG_UART_ENABLE);
-	sc->mpu = mpu401_init(&cmi_mpu_class, sc, cmi_intr, &sc->mpu_intr);
+	sc->mpu = mpu401_init(&cmi_mpu_class, sc, &sc->mpu_intr);
 }
 
 /* ------------------------------------------------------------------------- */
diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c
--- a/sys/dev/sound/pci/csamidi.c
+++ b/sys/dev/sound/pci/csamidi.c
@@ -95,15 +95,6 @@
 		bus_space_write_4(rman_get_bustag(scp->io), rman_get_bushandle(scp->io), offset, data);
 }
 
-static void
-csamidi_midi_intr(void *arg)
-{
-	struct csa_midi_softc *scp = (struct csa_midi_softc *)arg;
-
-	if (scp->mpu_intr)
-		(scp->mpu_intr)(scp->mpu);
-}
-
 static unsigned char
 csamidi_mread(struct mpu401 *arg __unused, void *cookie, int reg)
 {
@@ -213,8 +204,7 @@
 		goto err0;
 
 	/* init the fake MPU401 interface. */
-	scp->mpu = mpu401_init(&csamidi_mpu_class, scp, csamidi_midi_intr,
-	    &scp->mpu_intr);
+	scp->mpu = mpu401_init(&csamidi_mpu_class, scp, &scp->mpu_intr);
 	if (scp->mpu == NULL) {
 		rc = ENOMEM;
 		goto err1;
diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c
--- a/sys/dev/sound/pci/emu10k1.c
+++ b/sys/dev/sound/pci/emu10k1.c
@@ -1187,15 +1187,6 @@
 
 static DEFINE_CLASS(emu_mpu, emu_mpu_methods, 0);
 
-static void
-emu_intr2(void *p)
-{
-	struct sc_info *sc = (struct sc_info *)p;
-
-	if (sc->mpu_intr)
-	    (sc->mpu_intr)(sc->mpu);
-}
-
 static void
 emu_midiattach(struct sc_info *sc)
 {
@@ -1205,7 +1196,7 @@
 	i |= EMU_INTE_MIDIRXENABLE;
 	emu_wr(sc, EMU_INTE, i, 4);
 
-	sc->mpu = mpu401_init(&emu_mpu_class, sc, emu_intr2, &sc->mpu_intr);
+	sc->mpu = mpu401_init(&emu_mpu_class, sc, &sc->mpu_intr);
 }
 /* -------------------------------------------------------------------- */
 /* The interrupt handler */
diff --git a/sys/dev/sound/pci/emu10kx-midi.c b/sys/dev/sound/pci/emu10kx-midi.c
--- a/sys/dev/sound/pci/emu10kx-midi.c
+++ b/sys/dev/sound/pci/emu10kx-midi.c
@@ -128,12 +128,6 @@
 	return (intr_status); /* Acknowledge everything */
 }
 
-static void
-emu_midi_intr(void *p)
-{
-	(void)emu_midi_card_intr(p, 0);
-}
-
 static int
 emu_midi_probe(device_t dev)
 {
@@ -194,8 +188,7 @@
 	}
 
 	/* Init the interface. */
-	scp->mpu = mpu401_init(&emu_mpu_class, scp, emu_midi_intr,
-				&scp->mpu_intr);
+	scp->mpu = mpu401_init(&emu_mpu_class, scp, &scp->mpu_intr);
 	if (scp->mpu == NULL) {
 		emu_intr_unregister(scp->card, scp->ihandle);
 		mtx_destroy(&scp->mtx);