git: d6b36b860770 - stable/15 - sound: Retire SND_MULTICHANNEL

The branch stable/15 has been updated by christos:

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

commit d6b36b860770cc9ca4b4cb9669a8639248fd3c93
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-03-24 10:31:26 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-03-31 09:53:16 +0000

    sound: Retire SND_MULTICHANNEL
    
    SND_MULTICHANNEL is always defined, so SND_CHN_MAX will also always be
    8. Apart from the fact that there is no other place in the code that
    touches SND_MULTICHANNEL, there is also no good reason nowadays to set
    SND_CHN_MAX to 2.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D55934
    
    (cherry picked from commit 712bd9b2750a71ad7f8b6bebc5177c47d33a6364)
---
 sys/dev/sound/pcm/matrix.h | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/sys/dev/sound/pcm/matrix.h b/sys/dev/sound/pcm/matrix.h
index ff5f05e477e4..f4a79fdc3b30 100644
--- a/sys/dev/sound/pcm/matrix.h
+++ b/sys/dev/sound/pcm/matrix.h
@@ -29,8 +29,6 @@
 #ifndef _SND_MATRIX_H_
 #define _SND_MATRIX_H_
 
-#define SND_MULTICHANNEL	1
-
 /*
  * XXX = unused, but part of the definition (will be used someday, maybe).
  */
@@ -173,12 +171,7 @@
 #define SND_CHN_T_END		SND_CHN_T_TBR
 #define SND_CHN_T_STEP		1
 #define SND_CHN_MIN		1
-
-#ifdef SND_MULTICHANNEL
 #define SND_CHN_MAX		8
-#else
-#define SND_CHN_MAX		2
-#endif
 
 /*
  * Multichannel interleaved volume matrix. Each calculated value relative