From nobody Thu Nov 13 12:53:25 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 4d6gDj6BvRz6Gpqy; Thu, 13 Nov 2025 12:53: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 4d6gDj3nrwz41Q3; Thu, 13 Nov 2025 12:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763038405; 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=A0y2HGLdyTIg9LRcyC4gySGPL7hMH1T7i4yvO74MSfw=; b=hXIRD47oUAp1NC9lGc5tS6/7zFDPU0jJKoxZVRiqfuwP81Ifs8yJJLI172nxYGp+o9iwAd rKHmexteqVWdUhR0xiLd6SHgfniLCHPr4oXqU2Qr0RH/im16GQizBPbMOp+uEpYeMSJuW+ N24uVVCytD8U4mMvgJLdFwOLXAf+tRJhkOzAe4+og8CJcHWTP9GkOMl1/cIIiJzab4+E0B 6dozTKhYmto2QV7UUC+K4xD6+OHY2FdfNXrPVBWzwQ0LaS2FJX/OA80NA4x1uKrAaEVHUP igzvzn2vSIVTkUYRKRuCZUcN2ZhJdbrNG5xYbwfnFiQRssvuVEI/SrGAC3QWlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763038405; 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=A0y2HGLdyTIg9LRcyC4gySGPL7hMH1T7i4yvO74MSfw=; b=b09b3FxW356FgOIjsSRVpA8es66v6avDpk66hYEooq1tts4Y6iRK4ISsgKtfawpBM8XNVf PoUKVoyiBmxmTkRpGQ4hPHd2K4cp9tfK0O29gFZxhYRZEY5xa7AgqFlLp99Y3BrUsZtqDa 2RAATuNz5mGeOXxru+cXskyXWE2gJtcWrcxQ1lETPPcn7JJVXWphx2cvcnd79QdnYvLWP6 tJGBtDj0UEpqZuKkrIgd2HPOEaCLCKFKR5rTgz6uQ/UPRoTqLaFXKLUJr6dg1safi/lnn8 eWlDbQtsnYdPn1xQYjEaoKFMAksBu1b6R795YXwz/GMxLpTNH3MgdRZBSwZMdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763038405; a=rsa-sha256; cv=none; b=QWSMdfJkwfPqForj530VREXYY9Pu6ofdjgfQX4l+/DlJMStUTmpQqtoHDytdjB+pFJSvAn vn3W6+VUCH4mGJEngoyB3PoTX2GOwqjInmStukUHfBrzvLM8hJfhdIc9K4Gm8rKqI46L1F +07wHNKCYmFdSpejzCGDPaIqWmXjR2HpZXUv95iKUETitSfqPR9IXEmsHQhFlsVKQ52W93 sonFYh5HfijPMfT2IMszDSrx69CTAEALc0RceAEEjNqAnu6r2phWHkSxOum8Tcg6GZyDSU k5abEfS+NBVq1ia4EcGvWrFLoAUZM4GHu0SCwza3kZdym4tVbDiePIY8d53wJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d6gDj3BQyz6Bc; Thu, 13 Nov 2025 12:53:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5ADCrPpw056707; Thu, 13 Nov 2025 12:53:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5ADCrPam056704; Thu, 13 Nov 2025 12:53:25 GMT (envelope-from git) Date: Thu, 13 Nov 2025 12:53:25 GMT Message-Id: <202511131253.5ADCrPam056704@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: b55adf9b261b - main - sound: Retire unused mixer functions 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: b55adf9b261b91ddd3c7293720bbbbfb4ffe7066 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b55adf9b261b91ddd3c7293720bbbbfb4ffe7066 commit b55adf9b261b91ddd3c7293720bbbbfb4ffe7066 Author: Christos Margiolis AuthorDate: 2025-11-13 12:53:18 +0000 Commit: Christos Margiolis CommitDate: 2025-11-13 12:53:18 +0000 sound: Retire unused mixer functions No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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);