git: 615f4d520749 - main - sound: Retire unused locking macros

From: Christos Margiolis <christos_at_FreeBSD.org>
Date: Wed, 18 Nov 2026 10:24:33 UTC
The branch main has been updated by christos:

URL: https://cgit.FreeBSD.org/src/commit/?id=615f4d5207492a2ef49e9fbf3ea60f3cfb64460d

commit 615f4d5207492a2ef49e9fbf3ea60f3cfb64460d
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-11-18 10:18:02 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-11-18 10:18:02 +0000

    sound: Retire unused locking macros
    
    No functional change intended.
    
    MFC after:      2 weeks
    Sponsored by:   The FreeBSD Foundation
---
 sys/dev/sound/pci/ich.c     | 1 -
 sys/dev/sound/pcm/channel.h | 1 -
 sys/dev/sound/pcm/sound.h   | 2 --
 3 files changed, 4 deletions(-)

diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
index 819e640a4b6d..34418cd6d853 100644
--- a/sys/dev/sound/pci/ich.c
+++ b/sys/dev/sound/pci/ich.c
@@ -79,7 +79,6 @@
 
 #define ICH_LOCK(sc)		mtx_lock(&(sc)->ich_lock)
 #define ICH_UNLOCK(sc)		mtx_unlock(&(sc)->ich_lock)
-#define ICH_LOCK_ASSERT(sc)	mtx_assert(&(sc)->ich_lock, MA_OWNED)
 
 #if 0
 #define ICH_DEBUG(stmt)		do {	\
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 3e50f2714ee8..30b9ff801605 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -59,7 +59,6 @@ extern SLIST_HEAD(pcm_synclist, pcmchan_syncgroup) snd_pcm_syncgroups;
 
 #define PCM_SG_LOCKPTR()	(&snd_pcm_syncgroups_mtx)
 #define PCM_SG_LOCK()		mtx_lock(PCM_SG_LOCKPTR())
-#define PCM_SG_TRYLOCK()	mtx_trylock(PCM_SG_LOCKPTR())
 #define PCM_SG_UNLOCK()		mtx_unlock(PCM_SG_LOCKPTR())
 #define PCM_SG_LOCKASSERT(arg)	mtx_assert(PCM_SG_LOCKPTR(), arg)
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 5268f964d6f3..185159de84d1 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -207,10 +207,8 @@ int	sound_oss_card_info(oss_card_info *);
 #define	PCM_MODE_PLAY		0x02
 #define	PCM_MODE_REC		0x04
 
-#define PCM_LOCKOWNED(d)	mtx_owned(&(d)->lock)
 #define	PCM_LOCK(d)		mtx_lock(&(d)->lock)
 #define	PCM_UNLOCK(d)		mtx_unlock(&(d)->lock)
-#define PCM_TRYLOCK(d)		mtx_trylock(&(d)->lock)
 #define PCM_LOCKASSERT(d)	mtx_assert(&(d)->lock, MA_OWNED)
 #define PCM_UNLOCKASSERT(d)	mtx_assert(&(d)->lock, MA_NOTOWNED)