From nobody Tue Mar 4 15:47:02 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 4Z6g6J2DJ6z5qGYL; Tue, 04 Mar 2025 15:47:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6g6G3PfRz42DJ; Tue, 04 Mar 2025 15:47:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103222; 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=h5bNEsK1YaQAeaL6WannOlQbomp66rNEMeGFz9WTCtM=; b=c4jW7BRCRzEnvb1FVNt3wTA+95dwiqkSuPd9uxmXJV0xnNzjEDYXE/uY32poTawXYn4y4Q 74rKc5fbs0LAEUQ3WGK88i8s0pqa4Y4c058OxITGKC4s7RHLMoAhuPDqaJ8NGMSi0nvDg2 fLu5JAnlBnTAa/ZsHrIakZmQHU4wWTZiYJe3s+cvYg0RcRPaJF33Jwu2HrjZkU1XdcYveG /vIejgQlEa4Nz1gWdYHzLy1Sh16eoxF84bxf8JZHAG4x1qsLv9yWBIPsjbQ6ibSS0sfTri sGJPN6WIsdbzUmRiFIZhghFDX6J6kVGh0ziTSloEzthGH9AIYKpe/mJdMKJrig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103222; a=rsa-sha256; cv=none; b=gx9oqIAobSkJ/cJCGgr+aZ/bs/TOX4B38jR9rJ4MWm4HzRO0l1nMG8KPjnA/xbbfnS97Rw SpNrzLhY07bVDJPZ/lvqaFTke3vMrrTjt9x/PLOQnm90vnWTP6PHrDzxyATFT0prrV7RON r9kDBPBlnD4fGdZt7jZmbX1MnBqKuoa7OZ1eAGTvFa8j3MCV8cxaqoBtbI2Qj8I2ZdOfT/ BJnLPYQykollmtC3hLW4DHqOrsCG+4d7iDwAVMfNaMNSxvhxnslmh5ZyMw8UcyBfr8Dpzp fKy5/5Ztp42ur7hrh6VjlFOxQeJ+Ns4s9mpS3SPR3u39v92A6Mmy8MiUTFE1PA== 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=1741103222; 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=h5bNEsK1YaQAeaL6WannOlQbomp66rNEMeGFz9WTCtM=; b=upWvIkucv9baqXeodLjk1HmbrehYxkUDqa5eDTMrCkJzoKuKPKd0xVNP/padmxJkyDz4LU 9AqHTbbHqnd9U/uKMIG/uAOCd7a1UOSzd/J7jEscvNfyG41lc2IDUWRB/LdP+nvcYZ8SFv JoFcN4oR4zf9XwFLwwkURTCLvsAraa5ClSa7ozRDUIF798RBpQCfjr14lQZKKI+r7C/may eElx3xXgC3HL0bvYF+xYBPm5T8BfTx6C8RIP6a+e0JVxHKQI06HxRZi2tL5Es6LzwOB3P1 XF8OtrmVZeX4FcmQuAASrhQg/ab/+6YnDSHPCkfulX/lT0Lnt7PA47kueDBpfw== 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 4Z6g6G2xpFz8Z3; Tue, 04 Mar 2025 15:47:02 +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 524Fl2Zq049996; Tue, 4 Mar 2025 15:47:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524Fl27X049993; Tue, 4 Mar 2025 15:47:02 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:47:02 GMT Message-Id: <202503041547.524Fl27X049993@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: 5dc0c867c8ca - stable/14 - sound: Remove SNDBUF_LOCKASSERT() 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: 5dc0c867c8cae68cf867c82432ce013d83214cc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=5dc0c867c8cae68cf867c82432ce013d83214cc6 commit 5dc0c867c8cae68cf867c82432ce013d83214cc6 Author: Christos Margiolis AuthorDate: 2025-02-25 11:43:59 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:06 +0000 sound: Remove SNDBUF_LOCKASSERT() It's a no-op. There is no lock associated with the buffer. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: dev_submerge.ch, markj Differential Revision: https://reviews.freebsd.org/D48008 (cherry picked from commit 6524d2a5affd02623e6909fff0ca03ba21882a0c) --- sys/dev/sound/pcm/buffer.c | 22 ---------------------- sys/dev/sound/pcm/buffer.h | 2 -- 2 files changed, 24 deletions(-) diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index 8bf3631afb7a..de535ec2dcba 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -461,39 +461,30 @@ sndbuf_getsel(struct snd_dbuf *b) unsigned int sndbuf_getxrun(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->xrun; } void sndbuf_setxrun(struct snd_dbuf *b, unsigned int xrun) { - SNDBUF_LOCKASSERT(b); - b->xrun = xrun; } unsigned int sndbuf_gethwptr(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->hp; } void sndbuf_sethwptr(struct snd_dbuf *b, unsigned int ptr) { - SNDBUF_LOCKASSERT(b); - b->hp = ptr; } unsigned int sndbuf_getready(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl)); return b->rl; @@ -502,7 +493,6 @@ sndbuf_getready(struct snd_dbuf *b) unsigned int sndbuf_getreadyptr(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); KASSERT((b->rp >= 0) && (b->rp <= b->bufsize), ("%s: b->rp invalid %d", __func__, b->rp)); return b->rp; @@ -511,7 +501,6 @@ sndbuf_getreadyptr(struct snd_dbuf *b) unsigned int sndbuf_getfree(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl)); return b->bufsize - b->rl; @@ -520,7 +509,6 @@ sndbuf_getfree(struct snd_dbuf *b) unsigned int sndbuf_getfreeptr(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); KASSERT((b->rp >= 0) && (b->rp <= b->bufsize), ("%s: b->rp invalid %d", __func__, b->rp)); KASSERT((b->rl >= 0) && (b->rl <= b->bufsize), ("%s: b->rl invalid %d", __func__, b->rl)); @@ -530,40 +518,30 @@ sndbuf_getfreeptr(struct snd_dbuf *b) u_int64_t sndbuf_getblocks(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->total / b->blksz; } u_int64_t sndbuf_getprevblocks(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->prev_total / b->blksz; } u_int64_t sndbuf_gettotal(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->total; } u_int64_t sndbuf_getprevtotal(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - return b->prev_total; } void sndbuf_updateprevtotal(struct snd_dbuf *b) { - SNDBUF_LOCKASSERT(b); - b->prev_total = b->total; } diff --git a/sys/dev/sound/pcm/buffer.h b/sys/dev/sound/pcm/buffer.h index 2c5d6e7c214b..ddf4083ec19f 100644 --- a/sys/dev/sound/pcm/buffer.h +++ b/sys/dev/sound/pcm/buffer.h @@ -26,8 +26,6 @@ * SUCH DAMAGE. */ -#define SNDBUF_LOCKASSERT(b) - #define SNDBUF_F_MANAGED 0x00000008 #define SNDBUF_NAMELEN 48