From nobody Fri Jan 9 23:27:48 2026 X-Original-To: dev-commits-src-branches@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 4dnycP0b1dz6MYQ7 for ; Fri, 09 Jan 2026 23:27:49 +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 4dnycN6gNfz3n35 for ; Fri, 09 Jan 2026 23:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001268; 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=2nO2T5SJfmUaVdL2I8SLL89wuWsoQuh4v7J3ql1q2zQ=; b=mg6oUiC52iGWI01O6maSbIqKgDIz52oSLkZcltsJUcjJtLKGlk+OSPg6COucT8Q0BQdsLp 7nDUqsDn3bwTRjs+z7IoWbb1FMzXYrKmTTSvH8oE76OL5WC2QUdoxIzWZJKl8s0QiwN206 CiX36SUQVVciJNXXVF7J4P7YO3YrrPh5JvVp8FWYuqliwBRUW0hNEBYDCoLGoADD7fSWRz E5OpxPbSERTq0sdxresaKjMDwKTyA4zQaLNoHn3f5PclaiygfgQyuETi6YmiuJbPf3wqe3 CZxNC605wwSWylMLEfoqSZ+mkG+aa/TUin6Engz0NGNU+lp0/UtrqJr8uwGbIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768001268; 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=2nO2T5SJfmUaVdL2I8SLL89wuWsoQuh4v7J3ql1q2zQ=; b=xaaa51hxd/mImMvsixlvMlazFydXYse4gyIMKncjOHn4AuQ6bFuhqYVbRIXaGUwcmPAHLv rfJYJ/5qmyhWglc1rVZlcwU61J3eUBJKlUaG7MoktEH08tbiNj2Lpu2Z03KzWsByXrKu/1 qp1Pd/XmhO8R5+7B2uVeg4Pys4DNIlAowu4OVnGweJQnERwCnVIitEKKUceCMnCQsxKA9B QKjcg0cBSdoVXIJqsCxpF9AyMh7uuYekvjrEo0mVouiLNrQyte4tg+vC/IH/zZTzZ78sFe SM5BLJRps8FbL29RdtBKkwacERuuXwudz5peIPK7Rhz3WPcatMIx/yHUBRdKjw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768001268; a=rsa-sha256; cv=none; b=LUmXYGuBnOY34aqVToOyO0rSmr/5j+TxSuq6O2yHh/blRkTUzcs0ZnYxFHTq9f8qp5YBL2 IQ6S+j/LkuGoky5fCgWLl3hMTTOj0zyFomniU2BO16I6/2e1XSmY19jWbvs8BCLN1jOkKQ PFgaIJCSE7/FBcODKBlkXD3ozk2duPJma7wFIroecg6s4C72AVOOM9/zGxwYJFGHhmFw3b tMOrctaHryOAg+KXXnP3HNAex8iQ1AdRdC5yrTkVLgmYXsRlB6OKtoGfZTYBnYEAUufjcX 1IufvjXlSIuw6DGiW0m70SRix1SAk3Pjq9IziQOsJLrPaliU4Xm0XCFHyRWBag== 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 4dnycN6DLQzTWw for ; Fri, 09 Jan 2026 23:27:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32b31 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 23:27:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 177ea29c6baf - stable/15 - sound: Retire snd_midi->busy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 177ea29c6bafc760d084c7bd1871f6d38faa191c Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 23:27:48 +0000 Message-Id: <69618ef4.32b31.6a74e6fc@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=177ea29c6bafc760d084c7bd1871f6d38faa191c commit 177ea29c6bafc760d084c7bd1871f6d38faa191c Author: Christos Margiolis AuthorDate: 2026-01-02 16:56:22 +0000 Commit: Christos Margiolis CommitDate: 2026-01-09 23:27:23 +0000 sound: Retire snd_midi->busy Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit d54c782fde63d3b17433551da0b7ec94bc2a5ed4) --- sys/dev/sound/midi/midi.c | 31 +++++++------------------------ 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c index 2567f7412eb8..aa039018e207 100644 --- a/sys/dev/sound/midi/midi.c +++ b/sys/dev/sound/midi/midi.c @@ -68,7 +68,6 @@ struct snd_midi { int unit; int channel; - int busy; int flags; /* File flags */ char name[MIDI_NAMELEN]; MIDIQ_HEAD(, char) inq, outq; @@ -154,7 +153,6 @@ midi_init(kobj_class_t cls, void *cookie) (outqsize && !MIDIQ_BUF(m->outq))) goto err2; - m->busy = 0; m->flags = 0; m->unit = alloc_unr(dev_unr); m->channel = alloc_unr(chn_unr); @@ -188,20 +186,13 @@ int midi_uninit(struct snd_midi *m) { mtx_lock(&m->lock); - if (m->busy) { - if (!(m->rchan || m->wchan)) { - mtx_unlock(&m->lock); - return (EBUSY); - } - - if (m->rchan) { - wakeup(&m->rchan); - m->rchan = 0; - } - if (m->wchan) { - wakeup(&m->wchan); - m->wchan = 0; - } + if (m->rchan) { + wakeup(&m->rchan); + m->rchan = 0; + } + if (m->wchan) { + wakeup(&m->wchan); + m->wchan = 0; } mtx_unlock(&m->lock); MPU_UNINIT(m, m->cookie); @@ -338,7 +329,6 @@ midi_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (retval) goto err; } - m->busy++; m->rchan = 0; m->wchan = 0; @@ -384,7 +374,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) retval = ENXIO; goto err; } - m->busy--; oldflags = m->flags; @@ -396,8 +385,6 @@ midi_close(struct cdev *i_dev, int flags, int mode, struct thread *td) if ((m->flags & (M_TXEN | M_RXEN)) != (oldflags & (M_RXEN | M_TXEN))) MPU_CALLBACK(m, m->cookie, m->flags); - MIDI_DEBUG(1, printf("midi_close: closed, busy = %d.\n", m->busy)); - mtx_unlock(&m->lock); retval = 0; err: return retval; @@ -450,8 +437,6 @@ midi_read(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->rchan = 0; - if (!m->busy) - goto err1; } MIDI_DEBUG(6, printf("midi_read start\n")); /* @@ -522,8 +507,6 @@ midi_write(struct cdev *i_dev, struct uio *uio, int ioflag) goto err0; mtx_lock(&m->lock); m->wchan = 0; - if (!m->busy) - goto err1; } /*