git: 6524d2a5affd - main - sound: Remove SNDBUF_LOCKASSERT()

[Christos Margiolis]

The branch main has been updated by christos:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=6524d2a5affd02623e6909fff0ca03ba21882a0c

commit 6524d2a5affd02623e6909fff0ca03ba21882a0c
Author:     Christos Margiolis <chris...@freebsd.org>
AuthorDate: 2025-02-25 11:43:59 +0000
Commit:     Christos Margiolis <chris...@freebsd.org>
CommitDate: 2025-02-25 11:43:59 +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
---
 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