From nobody Thu Apr 18 12:40:00 2024
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 4VKy684LX8z5Gn2J;
Thu, 18 Apr 2024 12:40:00 +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 "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4VKy682lbPz44N8;
Thu, 18 Apr 2024 12:40:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1713444000;
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=F5aq9/lJ2bixMJW1xrg2ivsrLB62Z0JFG6hT1xICqJQ=;
b=HQHuDx+Yg1Dv0Kw16vavXrOCsHTnpLNPB4vd7gsOzVnrSRjZ9vYk4+Ca9LJjDPTuVTu1J+
RrksUSEmCNoRgC1zYwGT9iuM3Q7O3rmpKncYz1wc1dkwjF7VkWj9CtbF6DIFKZqE1VIrsT
k904E0cVW5fuRWOT6rvUMOY3OFb2EYiHf+ozSXGohvnXMGLwNdoE4LE4FuVy06kLRrKHbP
MzLxITOnRf4VLKRZTBpGh51vHxa90xXF1i0uJK4jjE3GkXowJ66m0/y0FTmHShd4kywMo2
NGpIZEQFJhSoL/PO/cSnAhrrTqf59I92LOMGUdOjftkdtKJCau57HOLUo7NLPQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713444000; a=rsa-sha256; cv=none;
b=Wmd0oemGd5V1+2kkAEYHMHOzw4TrhuUUoORjU6WvB3/FI/YOEoSXBER/xi6bogIp5tvLKU
tP0t6UxH+A8/No3pNkRmT2OSVIarpglkwjgYUmsz+abGDt147/mZeJkf1pUCYvDvYa9GKN
RpxbOcSioObGSGTM4kVAePhm+Wx4AR4k7xYniKcyKgLbqh6bBckKZ0uGH6vhGWHAkux/Kl
T59+fTMPcaPtSDlh+Xt957Xh329auzURzsiPxKL42swj50jP793OAWBRbiFrlsrGjenqtC
f5e89zSdyM1mGI1pzwTzN+dBeAY6DeZkEIfh4qlq/cG5fOxGvkCoQd1jKg/Bug==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1713444000;
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=F5aq9/lJ2bixMJW1xrg2ivsrLB62Z0JFG6hT1xICqJQ=;
b=aEvxc6B+nyQZcDsJd2hX59Yw8/ooyx3MwtUEbf6spEzvE3e+ijGapWQ531LLwkhMO6dmYd
EiN5XFbWmbhsVrUolfSZmGm9vEAu8GXe8TD0n1XqA1LLUiBNF3f+snKo3r0JpFDAZBer4z
6hc+K/aUTDw1yXX5vml9g/GL5Uqr+uWscyPj6mapQEXYAebnQF6Gs3nhGIU1+lfZPaLlI+
elsjWbotwn4M4RodGcN3e2apkm+z+WkT8N3QqaCQN5IA1Ukgch98vhRf/ei2XIisx32YOG
FGFLWFjONhXbsqMMPTSC3mQm8zLxWMisG37u2SpyVD44eIOKde0/74+teo7jUw==
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 4VKy682LPRz1970;
Thu, 18 Apr 2024 12:40:00 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43ICe03b036327;
Thu, 18 Apr 2024 12:40:00 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ICe0TY036324;
Thu, 18 Apr 2024 12:40:00 GMT
(envelope-from git)
Date: Thu, 18 Apr 2024 12:40:00 GMT
Message-Id: <202404181240.43ICe0TY036324@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-branches@FreeBSD.org
From: Christos Margiolis <christos@FreeBSD.org>
Subject: git: 5abbbb7c6401 - stable/14 - sound: Remove leftover
references to snd_clone
List-Id: Commits to the stable branches of the FreeBSD src repository <dev-commits-src-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches
List-Help: <mailto:dev-commits-src-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-src-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-branches+unsubscribe@freebsd.org>
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/14
X-Git-Reftype: branch
X-Git-Commit: 5abbbb7c640185c50762ee216b19429e8f562938
Auto-Submitted: auto-generated
The branch stable/14 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=5abbbb7c640185c50762ee216b19429e8f562938
commit 5abbbb7c640185c50762ee216b19429e8f562938
Author: Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-04-13 17:12:27 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-04-18 12:39:41 +0000
sound: Remove leftover references to snd_clone
The snd_clone framework does not exist as of
e8c0d15a64fadb4a330f2da7244becaac161bb70 ("sound: Get rid of snd_clone
and use DEVFS_CDEVPRIV(9)"), so remove leftover references to it from
unit.c.
Sponsored by: The FreeBSD Foundation
MFC after: 2 months
Reviewed by: markj
Differential Revision: https://reviews.freebsd.org/D44758
(cherry picked from commit 068c675ca7aec11d3546c3f908e842a7eca2ccae)
---
sys/dev/sound/unit.c | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/sys/dev/sound/unit.c b/sys/dev/sound/unit.c
index 1f1b889b42ce..28ffbde1f7ec 100644
--- a/sys/dev/sound/unit.c
+++ b/sys/dev/sound/unit.c
@@ -44,24 +44,17 @@
*
* eg: dsp0.p1 - u=0, d=p, c=1
* dsp1.vp0 - u=1, d=vp, c=0
- * dsp0.10 - u=0, d=clone, c=allocated clone (see further explanation)
*
- * Maximum unit of soundcards can be tuned through "hw.snd.maxunit", which
- * is between SND_UNIT_UMIN (16) and SND_UNIT_UMAX (2048). By design,
- * maximum allowable allocated channel is 256, with exception for clone
- * devices which doesn't have any notion of channel numbering. The use of
- * channel numbering in a clone device is simply to provide uniqueness among
- * allocated clones. This also means that the maximum allowable clonable
- * device is largely dependant and dynamically tuned depending on
- * hw.snd.maxunit.
+ * Maximum unit of soundcards can be tuned through "hw.snd.maxunit", which is
+ * between SND_UNIT_UMIN (16) and SND_UNIT_UMAX (2048). By design, the maximum
+ * allowable allocated channel is 256.
*/
/* Default width */
static int snd_u_shift = 9; /* 0 - 0x1ff : 512 distinct soundcards */
static int snd_d_shift = 5; /* 0 - 0x1f : 32 distinct device types */
static int snd_c_shift = 10; /* 0 - 0x3ff : 1024 distinct channels
- (256 limit "by design",
- except for clone devices) */
+ (256 limit "by design") */
static int snd_unit_initialized = 0;
@@ -184,10 +177,7 @@ snd_unit_init(void)
snd_u_shift++)
;
- /*
- * Make room for channels/clones allocation unit
- * to fit within 24bit MAXMINOR limit.
- */
+ /* Make room for channels to fit within 24bit MAXMINOR limit. */
snd_c_shift = 24 - snd_u_shift - snd_d_shift;
}