From nobody Fri May 17 19:31:03 2024 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 4Vgxs35bxBz5Lg9d; Fri, 17 May 2024 19:31:03 +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 4Vgxs345SCz4vKG; Fri, 17 May 2024 19:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715974263; 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=nQ7B6F4Wjrq8PipnfFyoeMp4VihySAKhlaFbEsbNCXg=; b=bbmb/kpfXhs1TRpKJH6YonVgYPbfpoL6vVE8XwFB1lcqNnP+85tu91iye4jkvBTp75vnPs FMU6PXUDPIh9cEW75SRPcmHPMMLO/CwbNyHQafCcubJ6HaYBeUwxdK3gLtiqmRe+XaIGQ7 tahMQIufr6uM2Y8alW7b0Qq7IW6Fnjp47gH1ctZXjnw3iuHipLMO5PU134E2A5Xi0npHZE JqhuZY2taDFu0A++u/nGmi7AST+oLBEIbLNSR4WhN07DXRPDfI4fxbGwxwBIzvr0p4YOxH tSgmKLPwNbT4nJzPjCSFPVXmjE/xwKwGC9jqmLuGEvSwf+/RfX//ZRngJzYB2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715974263; a=rsa-sha256; cv=none; b=bc9CQQ7XCaqemIVffE+tdS1AfLRP0SXE8C6wzmJ2QYRF9Idg7DEWp/3olVoLEauEHqg9MD nRPrBP82AHhp6FZI1NRikprpVj/3CZTMMBiMBthx1eRrTr0U3VMc7NcQ3ucgvbMl7nWEw9 pP47fgmQ6uI13WCGID03lReO3dlJUuB9+wdM4ENTlWVOYCJU6Mz2xt0dHnQF+feyRY5hpT bKa2V0qze4LHSfW+GX8HJzrBy+JZF5vHg0E77QSwRIVyKTjHCpe2W6dqBYsMH1QVrc+amc Ef9pmephGUYKEfwbTB4nd22TVt8plExemRH3wCjBcjzUzLzN3XI6+yWaTl6jww== 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=1715974263; 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=nQ7B6F4Wjrq8PipnfFyoeMp4VihySAKhlaFbEsbNCXg=; b=gl1Um4YSX1pmMSX3DhegTUf9Y+rAi1u17hsmjMDSdkkc00z34xJk/hJ+VwLsrh1ieSIswO T/jqDBbK/SdJylRodware+Ta6YYA6etzXrWr2v+vNlo0e7gVzFZnQBfyq09q0geZEpY/Jq X3alML0iKV/6DgOu94eSEMBYgCgKE3zZI3Xz8BdZ9sLzlOU2ZDsshYkzGh1CcqijMLalOe /riWNYJNffglSp4+TOoOxIB1+IqtcB/jco3l26luB8lkNq8zW9anLwZaK3pPD6VPPNvx1y ScoHHkhRqtMTfdmXGcPPTcHeBR6O4uQl4pF+JJ3wlhT6SEyMNtYl/pyVk4dOMQ== 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 4Vgxs33PkgzvfC; Fri, 17 May 2024 19:31:03 +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 44HJV31N099715; Fri, 17 May 2024 19:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44HJV3PP099712; Fri, 17 May 2024 19:31:03 GMT (envelope-from git) Date: Fri, 17 May 2024 19:31:03 GMT Message-Id: <202405171931.44HJV3PP099712@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: d1eaefde3bca - stable/14 - sound: Remove hw.snd.version and SND_DRV_VERSION 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/14 X-Git-Reftype: branch X-Git-Commit: d1eaefde3bca383abd419fd30796bffde242d385 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=d1eaefde3bca383abd419fd30796bffde242d385 commit d1eaefde3bca383abd419fd30796bffde242d385 Author: Christos Margiolis AuthorDate: 2024-05-06 18:30:58 +0000 Commit: Christos Margiolis CommitDate: 2024-05-17 19:30:35 +0000 sound: Remove hw.snd.version and SND_DRV_VERSION hw.snd.version and SND_DRV_VERSION define the sound driver version and are meant to be used in bug reports, but because these values are constant, there is not much useful information we can extract from them. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, emaste Differential Revision: https://reviews.freebsd.org/D44996 (cherry picked from commit 7398d1ece5cfa2e6ce4997234a95115b49c9e818) --- sys/dev/sound/pcm/sndstat.c | 8 ++------ sys/dev/sound/pcm/sound.c | 10 ---------- sys/dev/sound/version.h | 42 ------------------------------------------ 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index ef006a580d40..edb33e92ade9 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -51,7 +51,6 @@ #include #include -#include #include "feeder_if.h" @@ -1271,11 +1270,8 @@ sndstat_prepare(struct sndstat_file *pf_self) /* make sure buffer is reset */ sbuf_clear(s); - if (snd_verbose > 0) { - sbuf_printf(s, "FreeBSD Audio Driver (%ubit %d/%s)\n", - (u_int)sizeof(intpcm32_t) << 3, SND_DRV_VERSION, - MACHINE_ARCH); - } + if (snd_verbose > 0) + sbuf_printf(s, "FreeBSD Audio Driver\n"); /* generate list of installed devices */ k = 0; diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 9b4de948eac4..d2acfc403e8c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -41,7 +41,6 @@ #include #include #include -#include #include #include @@ -64,15 +63,6 @@ SYSCTL_NODE(_hw, OID_AUTO, snd, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, static void pcm_sysinit(device_t); -/* - * XXX I've had enough with people not telling proper version/arch - * while reporting problems, not after 387397913213th questions/requests. - */ -static char snd_driver_version[] = - __XSTRING(SND_DRV_VERSION)"/"MACHINE_ARCH; -SYSCTL_STRING(_hw_snd, OID_AUTO, version, CTLFLAG_RD, &snd_driver_version, - 0, "driver version/arch"); - /** * @brief Unit number allocator for syncgroup IDs */ diff --git a/sys/dev/sound/version.h b/sys/dev/sound/version.h deleted file mode 100644 index b816bbf964e8..000000000000 --- a/sys/dev/sound/version.h +++ /dev/null @@ -1,42 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause - * - * Copyright (c) 2007 Ariff Abdullah - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _SND_VERSION_H_ -#define _SND_VERSION_H_ - -/* - * FreeBSD sound driver internal versioning, nothing to do - * with OSS whatsoever. Dear future maintainer, please revisit - * this _before_ Jan 1 2148 - * - * Last 2 decimal places reserved for daily versioning, starting - * with 0. - */ -#define SND_DRV_VERSION 2009061500 - -#endif /* !_SND_VERSION_H_ */