git: f7571b01f3c1 - main - sound: Move channel teardown functions from sound.c to channel.c

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

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

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

    sound: Move channel teardown functions from sound.c to channel.c
    
    This was a layering violation.
    
    No functional change intended.
    
    MFC after:      2 weeks
    Sponsored by:   The FreeBSD Foundation
    Reviewed by:    markj
    Differential Revision:  https://reviews.freebsd.org/D60129
---
 sys/dev/sound/pcm/channel.c | 39 +++++++++++++++++++++++++++++-
 sys/dev/sound/pcm/channel.h |  3 ++-
 sys/dev/sound/pcm/sound.c   | 59 +++++++++------------------------------------
 3 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index ba9cd75109e4..8e2de264bdd6 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1334,7 +1334,7 @@ chn_kill(struct pcm_channel *c)
 	free(c, M_DEVBUF);
 }
 
-void
+static void
 chn_shutdown(struct pcm_channel *c)
 {
 	CHN_LOCKASSERT(c);
@@ -1343,6 +1343,43 @@ chn_shutdown(struct pcm_channel *c)
 	c->flags |= CHN_F_DEAD;
 }
 
+void
+chn_shutdownall(struct snddev_info *d)
+{
+	struct pcm_channel *c;
+
+	PCM_BUSYASSERT(d);
+	KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__));
+
+	CHN_FOREACH(c, d, channels.pcm) {
+		CHN_LOCK(c);
+		chn_shutdown(c);
+		if (c->inprog == 0 && CHN_STOPPED(c)) {
+			CHN_UNLOCK(c);
+			continue;
+		}
+		if (c->direction == PCMDIR_PLAY)
+			chn_flush(c);
+		else
+			chn_abort(c);
+		CHN_UNLOCK(c);
+	}
+}
+
+void
+chn_killall(struct snddev_info *d)
+{
+	struct pcm_channel *c;
+
+	PCM_BUSYASSERT(d);
+	KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__));
+
+	while (!CHN_EMPTY(d, channels.pcm)) {
+		c = CHN_FIRST(d, channels.pcm);
+		chn_kill(c);
+	}
+}
+
 /* release a locked channel and unlock it */
 int
 chn_release(struct pcm_channel *c)
diff --git a/sys/dev/sound/pcm/channel.h b/sys/dev/sound/pcm/channel.h
index 30b9ff801605..7f8e9fd26ee3 100644
--- a/sys/dev/sound/pcm/channel.h
+++ b/sys/dev/sound/pcm/channel.h
@@ -261,7 +261,8 @@ char *chn_mkname(char *buf, size_t len, struct pcm_channel *c);
 struct pcm_channel *chn_init(struct snddev_info *d, struct pcm_channel *parent,
     kobj_class_t cls, int dir, void *devinfo);
 void chn_kill(struct pcm_channel *c);
-void chn_shutdown(struct pcm_channel *c);
+void chn_shutdownall(struct snddev_info *d);
+void chn_killall(struct snddev_info *d);
 int chn_release(struct pcm_channel *c);
 int chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd);
 int chn_setvolume_multi(struct pcm_channel *c, int vc, int left, int right,
diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
index 28c1abd2a91d..7e44deab1abf 100644
--- a/sys/dev/sound/pcm/sound.c
+++ b/sys/dev/sound/pcm/sound.c
@@ -146,52 +146,6 @@ pcm_addchan(device_t dev, int dir, kobj_class_t cls, void *devinfo)
 	return (err);
 }
 
-static void
-pcm_shutdownchans(struct snddev_info *d)
-{
-	struct pcm_channel *ch;
-
-	PCM_BUSYASSERT(d);
-	KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__));
-
-	CHN_FOREACH(ch, d, channels.pcm) {
-		CHN_LOCK(ch);
-		chn_shutdown(ch);
-		if (ch->inprog == 0 && CHN_STOPPED(ch)) {
-			CHN_UNLOCK(ch);
-			continue;
-		}
-		if (ch->direction == PCMDIR_PLAY)
-			chn_flush(ch);
-		else
-			chn_abort(ch);
-		CHN_UNLOCK(ch);
-	}
-}
-
-static void
-pcm_killchans(struct snddev_info *d)
-{
-	struct pcm_channel *ch;
-
-	PCM_BUSYASSERT(d);
-	KASSERT(!PCM_REGISTERED(d), ("%s(): still registered", __func__));
-
-	while (!CHN_EMPTY(d, channels.pcm)) {
-		ch = CHN_FIRST(d, channels.pcm);
-		chn_kill(ch);
-	}
-
-	if (d->p_unr != NULL)
-		delete_unrhdr(d->p_unr);
-	if (d->vp_unr != NULL)
-		delete_unrhdr(d->vp_unr);
-	if (d->r_unr != NULL)
-		delete_unrhdr(d->r_unr);
-	if (d->vr_unr != NULL)
-		delete_unrhdr(d->vr_unr);
-}
-
 static int
 pcm_best_unit(int old)
 {
@@ -458,7 +412,7 @@ pcm_unregister(device_t dev)
 
 	PCM_ACQUIRE(d);
 	d->flags &= ~SD_F_REGISTERED;
-	pcm_shutdownchans(d);
+	chn_shutdownall(d);
 	PCM_RELEASE(d);
 
 	/*
@@ -469,7 +423,16 @@ pcm_unregister(device_t dev)
 	dsp_destroy_dev(dev);
 
 	PCM_ACQUIRE(d);
-	pcm_killchans(d);
+	chn_killall(d);
+
+	if (d->p_unr != NULL)
+		delete_unrhdr(d->p_unr);
+	if (d->vp_unr != NULL)
+		delete_unrhdr(d->vp_unr);
+	if (d->r_unr != NULL)
+		delete_unrhdr(d->r_unr);
+	if (d->vr_unr != NULL)
+		delete_unrhdr(d->vr_unr);
 	PCM_RELEASE(d);
 
 	if (d->play_sysctl_tree != NULL) {