From nobody Fri Nov 28 14:36:06 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 4dHwpH1KFfz6HZHy for ; Fri, 28 Nov 2025 14:36:07 +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 4dHwpH04Drz3tnt for ; Fri, 28 Nov 2025 14:36:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340567; 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=CZyrTkiBhodP/3wkC8h4K5TwGRJWNmOw0PtpHwmYFHM=; b=pIizVZfqaOWFU3PcAGvVAK0WcwCFxkWMxDfgZD264vTRuQ3zOEcAxrUf/AvpEKrNfM4bsb LMzvTen3hvmEwQLo0HXdSH07ZH3fGz8FQQ9j8e/Vg3/4wLZXc3ZeI3/nF7bSVmBra+/9H8 Z5XF6XK+M8IkJVs3cajkEYaLWvPYVydip0Z4WzH5qY2GFyg/NJsFWhVn71UUcOQad5kMp4 KhcFWDNGfd7xCBe+3nT8lsLx5m5uvDJvlmRjI5C0T4q3+Gb9liofFyTd8kwxrMXFkJJyEt 2n3MaaCpRYLPMDguTUt+H8rFSxFWvkAsYxAIQxQtibbvmsOlrl0a14ER1bGu9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1764340567; 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=CZyrTkiBhodP/3wkC8h4K5TwGRJWNmOw0PtpHwmYFHM=; b=YcDWI/MFLcJC3pMH/jpZCStEZfnJkzGWaWOgsjYLSW/UJ8tr/014XcZgBeSJrQ3HKiNfvj SSsamDOPvSDL0XUKfevGF6opHHlpOk8k1542MjvknW2kMcAoOZ7snP+TbTlgiDWb9ZLD/C XsTR4u0EZbQkjj6ACsCAmYNGhPdYr+AZtUpCu+AnfRNI+7pOBAoaUq9COajB9Dz/3AvpFR U2HRvta3Vqa7avXDu5Ff+QICDDjtLM2RXqCgfxF7lTl+1cJBX99UiAAWKDT2l58Ok5QCYk WZYzh/TZI9/08AMHczw48k5MzI9fbiQVq1D9ZDBC4f6d0J1ndmFOgVy4zeA1lA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1764340567; a=rsa-sha256; cv=none; b=R9Gk35YxztiOisOCGwvLCXbc8FiW0L5RDPz9bN9GgZ9ZBpda6nel3yH5x5lHTFS7jaEwjY 192k770YXdY+H1HP+3BeuuuXu62QeNrv697T6AoGCFKGgqJ6ggQCqXyzjZBH7DjTBCMdFX QXJSfJc44gZTZa0lyfaXrvcVbtOC0pdcbmEquQnCcJfUHstwA0pPxtsPJ/Ax+EL1OZMb8W Q6vqKO/EnzGF7koWVBG9+9R7AshyZAnTmWV23XO80aCMRChwJNUgk8vLPZdcueoairC4fK lauZHfbQknZcJ5xCPAxBVoiUVA75yXMG+R4AQWu7n2rv5WpMPPi1mk1/99fhjg== 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 4dHwpG6GHCz15Pf for ; Fri, 28 Nov 2025 14:36:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 288ef by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 28 Nov 2025 14:36:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: e5d50a679aa1 - main - 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/main X-Git-Reftype: branch X-Git-Commit: e5d50a679aa1a72a7cbcb0281b9420aad4a7dc7a Auto-Submitted: auto-generated Date: Fri, 28 Nov 2025 14:36:06 +0000 Message-Id: <6929b356.288ef.34d36fd4@gitrepo.freebsd.org> The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=e5d50a679aa1a72a7cbcb0281b9420aad4a7dc7a commit e5d50a679aa1a72a7cbcb0281b9420aad4a7dc7a Author: Christos Margiolis AuthorDate: 2025-11-28 14:35:56 +0000 Commit: Christos Margiolis CommitDate: 2025-11-28 14:35:56 +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 --- 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);