git: decc224ab899 - stable/14 - sound: Remove PCMMINOR()

The branch stable/14 has been updated by christos:

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

commit decc224ab8993797473a5d37d60588a021965d2f
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2024-04-18 20:35:15 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2024-05-17 19:30:01 +0000

    sound: Remove PCMMINOR()
    
    It's a NO-OP.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    Reviewed by:    markj, emaste
    Differential Revision:  https://reviews.freebsd.org/D44854
    
    (cherry picked from commit 8b97dce6973ca1b6c3407c34c76d459f43ca1061)
---
 sys/dev/sound/pci/emu10kx.c | 2 +-
 sys/dev/sound/pcm/mixer.c   | 4 ++--
 sys/dev/sound/pcm/sound.h   | 3 ---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys/dev/sound/pci/emu10kx.c b/sys/dev/sound/pci/emu10kx.c
index 6bbbfcc1df0e..d17f5fb16d34 100644
--- a/sys/dev/sound/pci/emu10kx.c
+++ b/sys/dev/sound/pci/emu10kx.c
@@ -2313,7 +2313,7 @@ emu10kx_dev_init(struct emu_sc_info *sc)
 	mtx_init(&sc->emu10kx_lock, device_get_nameunit(sc->dev), "kxdevlock", 0);
 	unit = device_get_unit(sc->dev);
 
-	sc->cdev = make_dev(&emu10kx_cdevsw, PCMMINOR(unit), UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit);
+	sc->cdev = make_dev(&emu10kx_cdevsw, unit, UID_ROOT, GID_WHEEL, 0640, "emu10kx%d", unit);
 	if (sc->cdev != NULL) {
 		sc->cdev->si_drv1 = sc;
 		return (0);
diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
index 24fc5678af71..2f4a6f4d6395 100644
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -765,8 +765,8 @@ mixer_init(device_t dev, kobj_class_t cls, void *devinfo)
 	mixer_setrecsrc(m, 0); /* Set default input. */
 
 	devunit = snd_mkunit(unit, SND_DEV_CTL, 0);
-	pdev = make_dev(&mixer_cdevsw, PCMMINOR(devunit),
-		 UID_ROOT, GID_WHEEL, 0666, "mixer%d", unit);
+	pdev = make_dev(&mixer_cdevsw, devunit, UID_ROOT, GID_WHEEL, 0666,
+	    "mixer%d", unit);
 	pdev->si_drv1 = m;
 	snddev->mixer_dev = pdev;
 
diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h
index 3b725603ee2b..b72348ccf486 100644
--- a/sys/dev/sound/pcm/sound.h
+++ b/sys/dev/sound/pcm/sound.h
@@ -115,9 +115,6 @@ struct snd_mixer;
 #define PCMDEV(x)		(snd_unit2d(dev2unit(x)))
 #define PCMCHAN(x)		(snd_unit2c(dev2unit(x)))
 
-/* XXX unit2minor compat */
-#define PCMMINOR(x)	(x)
-
 /*
  * By design, limit possible channels for each direction.
  */