From nobody Thu Nov 20 13:31:40 2025 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 4dBzlc544dz6HP2y for ; Thu, 20 Nov 2025 13:31:40 +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 4dBzlc32NWz44Xc for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; 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=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=QAoYaD36tns56ih1GklIOstRPhKsWKbnMYiKAHzZY0Ws/u9fIKGhC48YzkTt0upQgWc/cH RIhG7KCv+uJmHc96G4Rukk9fD5/+mbwlAH6pNiQv9jJd/zKK92sjAAznfqOFEUUVyvT0TH SO52lVnfrTbmvv18WMyDPj+v8FzReJtU2xsnQ68Hd3Z/kGtdkRdNIkyISSEjgyhJdpIw9a FNmMhq801h18Yv9KGgsjNNAPAz/WTz3pkFlKNpI/pCa3GZFI94wW9zf/737EU/MMgTjPB5 M+hiUHp14iAvETkeX1YXH/xgMcw0jIYBA3sjPikUplkoJc/ZxXE7NjJ9r0BDUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763645500; 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=Lcy0wad7lnD5i+sMSTZn95QO7OSe8opb/zqEvdzCQQk=; b=wr9CoNZ3nJlQVQa4vY92+4XAT2teCwi6yWprCVXkPWlGyd1VnCDTBbdEctCJ3ISMchTt1m FyTmlxjL4V7kAts0iCOx3K0OkQ5RJ1VGaM/Wm60ggNIqqfOdrNzJ1WGZqNWJXbsj2VINv6 UjHrA+XcrtOIir1eqO+7PS9MXyU0Vz2o4AcUlVdAFhn+Md7XNPrBVKeIle4FETSftXUfEx 8dQKmFWrlhBQjr81rVxHWFqfrbio22M1uAGR6GyETquvBVjNP569ZRPagf6UjaHJDyyB05 BVXzpcBi9Ek0mADJFENRKMkkeo583B64dsO2GMSKufGTb20Nwuiwd0ibo5l2Ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763645500; a=rsa-sha256; cv=none; b=s5YAQrCxogdvsxlM+Gvt1l959cI1OvIYoPaUkQyq7SXyOjwSHNNOLM6xFxINxUsaNU0CPL 1VY/M1X/5NK9gXMTEqxLom6JAi9hADA21t25UatYktfrVPxjX8PV3VNEuM8xY+WpSkvRKl QMdox0vkH+4GfqUQlZ54G/akWBcytZikO7Sb2dadbnaBDfDEGfra9sGtz/9CR8SGhaEqLz 9XS/aIbf7XlTrMHL87lXqd7OwO+N9rdTVXiCFnrLDK1WhnX/NCRq1sAx8kkqmFxbBko5ch rm+BpSPbbGaoYl+geMp/58FEZbkAsegQsG7LqFra80+rr+9FcSQkVUqf2xXB/A== 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 4dBzlc2b7JzCYX for ; Thu, 20 Nov 2025 13:31:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2cd2b by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 20 Nov 2025 13:31:40 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: cc931f5bf6b2 - stable/15 - sound: Retire unused mixer functions 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: cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Auto-Submitted: auto-generated Date: Thu, 20 Nov 2025 13:31:40 +0000 Message-Id: <691f183c.2cd2b.c380ff0@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=cc931f5bf6b2a2aa2290980898bb7cb6b7805914 commit cc931f5bf6b2a2aa2290980898bb7cb6b7805914 Author: Christos Margiolis AuthorDate: 2025-11-13 12:53:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-20 13:28:14 +0000 sound: Retire unused mixer functions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week (cherry picked from commit b55adf9b261b91ddd3c7293720bbbbfb4ffe7066) --- sys/dev/sound/pcm/mixer.c | 43 ------------------------------------------- sys/dev/sound/pcm/mixer.h | 4 ---- 2 files changed, 47 deletions(-) diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index f281dff36248..5fa3ff5cc83c 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -608,14 +608,6 @@ mix_getparent(struct snd_mixer *m, u_int32_t dev) return m->parent[dev]; } -u_int32_t -mix_getchild(struct snd_mixer *m, u_int32_t dev) -{ - if (m == NULL || dev >= SOUND_MIXER_NRDEVICES) - return 0; - return m->child[dev]; -} - u_int32_t mix_getdevs(struct snd_mixer *m) { @@ -1024,14 +1016,6 @@ mix_getrecsrc(struct snd_mixer *m) return (ret); } -int -mix_get_type(struct snd_mixer *m) -{ - KASSERT(m != NULL, ("NULL snd_mixer")); - - return (m->type); -} - device_t mix_get_dev(struct snd_mixer *m) { @@ -1573,30 +1557,3 @@ mixer_get_lock(struct snd_mixer *m) } return (m->lock); } - -int -mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright) -{ - int level; - - level = mixer_get(m, dev); - if (level < 0) { - *pright = *pleft = -1; - return (-1); - } - - *pleft = level & 0xFF; - *pright = (level >> 8) & 0xFF; - - return (0); -} - -int -mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right) -{ - int level; - - level = (left & 0xFF) | ((right & 0xFF) << 8); - - return (mixer_set(m, dev, m->mutedevs, level)); -} diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h index 7139a766b392..c47247ab570d 100644 --- a/sys/dev/sound/pcm/mixer.h +++ b/sys/dev/sound/pcm/mixer.h @@ -47,13 +47,10 @@ void mixer_hwvol_step(device_t dev, int left_step, int right_step); int mixer_busy(struct snd_mixer *m); -int mix_get_locked(struct snd_mixer *m, u_int dev, int *pleft, int *pright); -int mix_set_locked(struct snd_mixer *m, u_int dev, int left, int right); 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); u_int32_t mix_getrecsrc(struct snd_mixer *m); -int mix_get_type(struct snd_mixer *m); device_t mix_get_dev(struct snd_mixer *m); void mix_setdevs(struct snd_mixer *m, u_int32_t v); @@ -65,7 +62,6 @@ u_int32_t mix_getmutedevs(struct snd_mixer *m); void mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs); void mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev); u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev); -u_int32_t mix_getchild(struct snd_mixer *m, u_int32_t dev); void *mix_getdevinfo(struct snd_mixer *m); struct mtx *mixer_get_lock(struct snd_mixer *m);