From nobody Fri Jan 2 16:58:18 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4djVJD0kLwz6LvTF for ; Fri, 02 Jan 2026 16:58:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4djVJC0Hwmz42K2 for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=SVp5hdQvJ2Ten646hH88egO6Ub8PsyYQCB4VcYYGKEmJhaVXUXgl3YyDpTkUh7PW7RW9oU icmtgNtqc3AUbhRNaiLrZ7EHUAz/4f832jd74BSCstkEmMg9/V8Xc54lTMz5lNEpZpq7Ut ixdJH5cD4nnOn7VEdbjbs2OHN1gxUVJYpjKmFJxHSQ0+9pYyoJC68PzLaUzB3Bbxqu43BL NIUhqwmzdfuA5eoDFuVGgO548J1IPtjEvwn5S84VIoU8/+y1NYUJZxWIwVsUKsbos/BKn/ Kj3cNY+x6VLE7n0BidaOv1IO7MxRNuJ1DqNvq/qob6yU3n0OZwemZi9+6/9QJw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767373099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1ArrTe4iue2UTq+b+tG8h8qw6gnNCcKmjGbvElHQkSg=; b=x3a0gzXE6KAMH2HBICPGVLXc6yDCF5dodgRWIe9aw5DjxDn46mizoAsEUg44IGZQ5DjCQu eBW9JvM0yOCBV1lFjAGm48SJWSHPjSG1HMdgBi3cep8Jwv3IG8q0dJxUJ8oUi/8TZAYLHs L6kSsIepihbRvHDTMpf1Bji0xs4jbEoK1qXk41NQ4FqO1pVJiivPyUnYrv6EAzdJsYpomQ 36bd7B31RBK6l3fWRVDFBmPLZGDeGVSEjPzVALAvedAaH4q7iZIkTbVck3lI8PYDaD479q dQqAobWwqRpYg/Buqxin1Hu9PblnTuB62EMrL6sWbglnEb2lI1ssGoUVpI6Egg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767373099; a=rsa-sha256; cv=none; b=IHNBvBK1zkhNB0tZCc0Rvmpr6tQ71LVykZH/BcwMpy8+Z4R3E1DQwnEH5PQOExx/Y6JwHj nLkbgAJ87dHx3mcTxgBTkwcjV9TlWJpRHb9Dgt2CpndTRH0HWqgN9Usohu+af5/jlvLC1L OxkbCbBlnOGz1RQPPn3uC5feeeRt/O/C+PLq/yuKG/w5C/7568UpmnZBtRyqOdCYzR6GPS tmjkALZXUBDMbyU8j5v0Q/Jtw7byvYSS3lEjdJMK8NiawKWQgMW3GIs1XVjuyOxCV9Qn+Q 3JsWQlMQTmsD8u4l8mLFZM/fJ43QLdEfBpq9wZtFVjffzcoElJf+CKgBE3te0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4djVJB5sCLzBGy for ; Fri, 02 Jan 2026 16:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 24212 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 02 Jan 2026 16:58:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 45bb10e0ed5a - main - sound: Stop building midi as a module List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45bb10e0ed5a0b87adcae33635400b5bc36337ec Auto-Submitted: auto-generated Date: Fri, 02 Jan 2026 16:58:18 +0000 Message-Id: <6957f92a.24212.62547574@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=45bb10e0ed5a0b87adcae33635400b5bc36337ec commit 45bb10e0ed5a0b87adcae33635400b5bc36337ec Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:57 +0000 Commit: Christos Margiolis 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 #include #include -#include #include #include #include @@ -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);