From nobody Sat Dec 6 13:36:24 2025 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 4dNq5j3QMkz6KjX8 for ; Sat, 06 Dec 2025 13:36:25 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dNq5j0KD1z3l40 for ; Sat, 06 Dec 2025 13:36:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765028185; 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=ay3aDdw8T3fJd/q2Uh6KoTzOO5K5DGJkHf3YDpVcBcw=; b=n8X6YCwP26GG9rc+Y6kAF4SoSSij+e3Oyg7vOx1BkUJfLmnGdjsNoeePp20mhFyEVr3gFc a+iMaZJplP7ItAAV9oG4nbT6+5puxOn2rh6/jMb051cFje5OKhbsP8Mz10nODZtqywZtM7 vZRDrEGijP4wzmF/+BlFC6njZZVVUD2m6AMiyR/QVQYX3g4WsNik2gF+rOiF17//vonaRT Q6c8aN5tXpGLMrhOJwgRNUdbM1p2Ldi4WrN1wrbv7H+4RTmua9WqUY4qa6M1xTcFKtCMbC pLGmUefOOsq1N3Vf6xpLsUClQDZkmoSHg0wWNsHYyst3M5UcaQCMeNRgaBN/vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765028185; 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=ay3aDdw8T3fJd/q2Uh6KoTzOO5K5DGJkHf3YDpVcBcw=; b=Hp1IKMK65FLHGm3qwfHEZoU31EJmYpjBdm7DsuvoXBCYXXKuMgEhnWOX7DiIE5zWy2JSXG z83MeU/NDIo4CcIk9lrMAeWMM00V0xdGpowb8r3Zt2NIkAiWJWUT7U1vKEB7iIxVZzLFOO bSrUTqJ+fx9XrMdsPFYSP9rXCIGhS6x99FXpNAgG75SAOfkpaQEe3fiZ4GZ6oAiHdeFWpx RP2Rm+AxmKqejfAuJT0NNWaZIGLNqXcxsNeMpE3IhaT7M/8zPXLupzbbQe4EzScwDT/tWp RD3CWgJUEfkXjg6TAdwzQrB4izKiIqQ4qqCQ3LVMtznriYPt8mV7QVzwIbSyVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765028185; a=rsa-sha256; cv=none; b=kVybjhSqnB7+PFYzAF4nApPC6UCMELbTBg3vHE+N4x66gdmxniLsaZB4mfBd8hJK+aBi0L DeEr6WQ8RdEdqVkdngDLvT6Xenjq7uN4LpjYNAazN8BZmgiaBuTmXFyzrRd5fWILruDGdQ xMtVcvz8wTH/A9f7NMRyDcyEkoH2R1DZ2QOh/RLzqIOfjNT1bwc8DnYE09fOTOtJUZASxc a9lOkzoY3ccCyuD5cggE5dYROLGLYhG+fKuXS9auxVyeY955iMVdTUNVM9q3upfzjGeKig zBz8wCPEpNIlYnQHJ6i03nVua7YHxoUJ/QHI34G8HM1uuwG6zvYirYjCdMlKEQ== 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 4dNq5h67Znzy46 for ; Sat, 06 Dec 2025 13:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2541a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 06 Dec 2025 13:36:24 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 26365bf2516f - stable/15 - sound: Retire snd_mixer->busy 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: 26365bf2516f7c7936b6d5034901b158f07f1f17 Auto-Submitted: auto-generated Date: Sat, 06 Dec 2025 13:36:24 +0000 Message-Id: <69343158.2541a.18465fe6@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=26365bf2516f7c7936b6d5034901b158f07f1f17 commit 26365bf2516f7c7936b6d5034901b158f07f1f17 Author: Christos Margiolis AuthorDate: 2025-11-28 14:35:56 +0000 Commit: Christos Margiolis CommitDate: 2025-12-06 13:36:18 +0000 sound: Retire snd_mixer->busy Does not really serve any real purpose. It gets set on mixer_open() and unset on mixer_close(), so it essentially tells us whether the mixer is open or not. mixer_close() uses it to return EBADF in case the mixer is not busied, as in, the mixer has not been open()'d yet. This is redundant. The other place where this is used is to decide whether to serve an ioctl issued by userland, in which case it won't if, again, the mixer has not been busied (i.e., opened). Again, seems redundant. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53859 (cherry picked from commit e5d50a679aa1a72a7cbcb0281b9420aad4a7dc7a) --- sys/dev/sound/pci/es137x.c | 4 ---- sys/dev/sound/pcm/mixer.c | 30 +----------------------------- sys/dev/sound/pcm/mixer.h | 2 -- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index cc51005309b0..4e8c7911e95e 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -1540,10 +1540,6 @@ sysctl_es137x_single_pcm_mixer(SYSCTL_HANDLER_ARGS) PCM_RELEASE_QUICK(d); return (ENODEV); } - if (mixer_busy(m) != 0) { - PCM_RELEASE_QUICK(d); - return (EBUSY); - } level = mix_get(m, SOUND_MIXER_PCM); recsrc = mix_getrecsrc(m); if (level < 0 || recsrc < 0) { diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 55ce9596dde9..f6eb669010b5 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -48,7 +48,6 @@ SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RWTUN, struct snd_mixer { KOBJ_FIELDS; void *devinfo; - int busy; int hwvol_mixer; int hwvol_step; int type; @@ -651,7 +650,6 @@ mixer_obj_create(device_t dev, kobj_class_t cls, void *devinfo, "primary pcm mixer" : "secondary pcm mixer", MTX_DEF); m->type = type; m->devinfo = devinfo; - m->busy = 0; m->dev = dev; for (i = 0; i < nitems(m->parent); i++) { m->parent[i] = SOUND_MIXER_NONE; @@ -947,14 +945,6 @@ mixer_hwvol_step(device_t dev, int left_step, int right_step) mtx_unlock(&m->lock); } -int -mixer_busy(struct snd_mixer *m) -{ - KASSERT(m != NULL, ("NULL snd_mixer")); - - return (m->busy); -} - int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right) { @@ -1035,12 +1025,6 @@ mixer_open(struct cdev *i_dev, int flags, int mode, struct thread *td) if (!PCM_REGISTERED(d)) return (EBADF); - /* XXX Need Giant magic entry ??? */ - - mtx_lock(&m->lock); - m->busy = 1; - mtx_unlock(&m->lock); - return (0); } @@ -1049,7 +1033,6 @@ mixer_close(struct cdev *i_dev, int flags, int mode, struct thread *td) { struct snddev_info *d; struct snd_mixer *m; - int ret; if (i_dev == NULL || i_dev->si_drv1 == NULL) return (EBADF); @@ -1059,14 +1042,7 @@ mixer_close(struct cdev *i_dev, int flags, int mode, struct thread *td) if (!PCM_REGISTERED(d)) return (EBADF); - /* XXX Need Giant magic entry ??? */ - - mtx_lock(&m->lock); - ret = (m->busy == 0) ? EBADF : 0; - m->busy = 0; - mtx_unlock(&m->lock); - - return (ret); + return (0); } static int @@ -1262,10 +1238,6 @@ mixer_ioctl_cmd(struct cdev *i_dev, u_long cmd, caddr_t arg, int mode, return (EBADF); mtx_lock(&m->lock); - if (from == MIXER_CMD_CDEV && !m->busy) { - mtx_unlock(&m->lock); - return (EBADF); - } switch (cmd) { case SNDCTL_DSP_GET_RECSRC_NAMES: bcopy((void *)&m->enuminfo, arg, sizeof(oss_mixer_enuminfo)); diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index c47247ab570d..3ce8a4f5adee 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -45,8 +45,6 @@ void mixer_hwvol_mute(device_t dev); void mixer_hwvol_step_locked(struct snd_mixer *m, int l_step, int r_step); void mixer_hwvol_step(device_t dev, int left_step, int right_step); -int mixer_busy(struct snd_mixer *m); - int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right); int mix_get(struct snd_mixer *m, u_int dev); int mix_setrecsrc(struct snd_mixer *m, u_int32_t src);