From nobody Fri Jan 9 23:27:42 2026 X-Original-To: dev-commits-src-all@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 4dnycG5tMLz6MYPk for ; Fri, 09 Jan 2026 23:27:42 +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 4dnycG2rD2z3mr5 for ; Fri, 09 Jan 2026 23:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001262; 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=wU5YaTWsc/kXSPAYuFUYwjipPlOdVdRAXT/LtTHDUoc=; b=th2buS/NfMb12jbptg8F8dPTkYg9ST/oUEFv1tmj+0psqOOtgejQNKgD2TeghXJtBrx+N/ YLlHeQGLENkchHJE1CGUV72mbX1QdQHEAZLv4+frqqE3p47nhgxELbl73ecfL0OWLwPFYF R9STp7fliC/vAsh/8xz+OBmyaPqY2kRVdQNAA58bwMJbOScwHDcVXIXZMm72/WD/Nz9ayN VizU+uPyd02cCjsh7Q/Ptd6eH5vufH+UkL3Z4fDWmOr3zDlQuTgEBfUHMAa9awvUJdCdbh u0aUnferkl1yUlx73eNiwkTT84rNsnvt1u5TQ5+/e7SDgr9kIrUFyeugiowf1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001262; 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=wU5YaTWsc/kXSPAYuFUYwjipPlOdVdRAXT/LtTHDUoc=; b=LYlMF5gQJ2jUX9zBt04ootO66JUboWh56ReuGmIVCIhdHXObpdi+xidedAeZQLyu+BIV34 9I3Dx8X9gdFrRfa+MFRTABdQ0+l0WzcrGglTV6yTIfaUt64k99Rq5/akytwCKr54AXlA3k gkIHdLsi18JjmiyQT6/N2V+nTm12mBwhbOE80DEb6gayg+mEVC4QHOHHm8P89Rr8ALEaF7 jBqyztV0zvEQw88XraRY+ItWD/81OX82kglSQLYBKGRb3x1lEkv/mvauhdiZirvoTDb+ZQ p5w/hB6zLOqt5DwvUdFXpI3SXI3RQaK8i23c8pDSOAEyEWyQnMbcYQsQDt80pQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001262; a=rsa-sha256; cv=none; b=B+r+Byizr68yXxnos1QXk752qTWQc43roN8m73Cjz+By1yk84Gx54beJmkXg//kfgyN7PD qeOkEaImvypveychtdv0h9uk2vWqfPMQaYBQTHZtPoPsnImBijKTQH1BhwQw3ZNkqkPLlx yOTXZRgl0Z/XwDRr5ipAIr/+THBga8S7igVYjW/NMoBfTNHcznh0F396YnajJ2xyMoPFNe DGRXw4+T52R4qB1JL1rJR+bKLbKX0KEOO6XYqSuv/F6+yaoXQODeA4cIBYUhlQnUNriorv w1sZ5jpeeeDDAjDlBgHDQn5K7nSCjGDvmVY8yl7V5t4CX7Wliyf3nvbEZqf4Ig== 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 4dnycG2MffzTTx for ; Fri, 09 Jan 2026 23:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32b2d by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:27:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 7154f9d06460 - stable/15 - sound: Stop building midi as a module List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 7154f9d06460adbeb1f3ad4f972eedd5e78cfb56 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:27:42 +0000 Message-Id: <69618eee.32b2d.abb3ed1@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=7154f9d06460adbeb1f3ad4f972eedd5e78cfb56 commit 7154f9d06460adbeb1f3ad4f972eedd5e78cfb56 Author: Christos Margiolis AuthorDate: 2026-01-02 16:55:57 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:22 +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 (cherry picked from commit 45bb10e0ed5a0b87adcae33635400b5bc36337ec) --- 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);