Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 02 Jan 2026 16:58:18 +0000
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 45bb10e0ed5a - main - sound: Stop building midi as a module
Message-ID:  <6957f92a.24212.62547574@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=45bb10e0ed5a0b87adcae33635400b5bc36337ec

commit 45bb10e0ed5a0b87adcae33635400b5bc36337ec
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-01-02 16:55:57 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-01-02 16:58:04 +0000

    sound: Stop building midi as a module
    
    There is no reason for this. The midi functions are used by drivers
    on-demand anyway. Use SYSINIT(9) instead to do the appropriate
    (de-)initilizations.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D54125
---
 sys/dev/sound/midi/midi.c | 44 +++++++-------------------------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index cca7b93abf5f..bf8d602c75df 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -37,7 +37,6 @@
 #include <sys/kernel.h>
 #include <sys/kobj.h>
 #include <sys/lock.h>
-#include <sys/module.h>
 #include <sys/mutex.h>
 #include <sys/poll.h>
 #include <sys/queue.h>
@@ -102,8 +101,6 @@ static struct cdevsw midi_cdevsw = {
 };
 
 static int      midi_destroy(struct snd_midi *, int);
-static int      midi_load(void);
-static int      midi_unload(void);
 
 SYSCTL_NODE(_hw, OID_AUTO, midi, CTLFLAG_RD | CTLFLAG_MPSAFE, 0,
     "Midi driver");
@@ -701,17 +698,16 @@ midi_destroy(struct snd_midi *m, int midiuninit)
 	return 0;
 }
 
-static int
-midi_load(void)
+static void
+midi_sysinit(void *data __unused)
 {
 	sx_init(&mstat_lock, "midistat lock");
 	TAILQ_INIT(&midi_devs);
-
-	return 0;
 }
+SYSINIT(midi_sysinit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysinit, NULL);
 
-static int
-midi_unload(void)
+static void
+midi_sysuninit(void *data __unused)
 {
 	struct snd_midi *m, *tmp;
 	int retval;
@@ -731,38 +727,12 @@ midi_unload(void)
 	midistat_unlock();
 
 	sx_destroy(&mstat_lock);
-	return 0;
+	return;
 
 exit:
 	mtx_unlock(&m->lock);
 	midistat_unlock();
 	if (retval)
 		MIDI_DEBUG(2, printf("midi_unload: failed\n"));
-	return retval;
-}
-
-static int
-midi_modevent(module_t mod, int type, void *data)
-{
-	int retval;
-
-	retval = 0;
-
-	switch (type) {
-	case MOD_LOAD:
-		retval = midi_load();
-		break;
-
-	case MOD_UNLOAD:
-		retval = midi_unload();
-		break;
-
-	default:
-		break;
-	}
-
-	return retval;
 }
-
-DEV_MODULE(midi, midi_modevent, NULL);
-MODULE_VERSION(midi, 1);
+SYSUNINIT(midi_sysuninit, SI_SUB_DRIVERS, SI_ORDER_FIRST, midi_sysuninit, NULL);
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?6957f92a.24212.62547574>