The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=99e372420df4a8f1905b43c0f905de4a56795037
commit 99e372420df4a8f1905b43c0f905de4a56795037 Author: Christos Margiolis <[email protected]> AuthorDate: 2024-05-06 18:32:57 +0000 Commit: Christos Margiolis <[email protected]> CommitDate: 2024-05-17 19:30:35 +0000 sound: Rename pcm_getparentchannel() to vchan_getparentchannel() Follow the rest of the vchan.c naming convention. No functional change intended. Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D45016 (cherry picked from commit 77ab4263bc42a5dcc102bbea39ce4f7f46b8d4f8) --- sys/dev/sound/pcm/vchan.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 9df23298b742..904ce6661675 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -251,7 +251,7 @@ static kobj_method_t vchan_methods[] = { CHANNEL_DECLARE(vchan); static void -pcm_getparentchannel(struct snddev_info *d, +vchan_getparentchannel(struct snddev_info *d, struct pcm_channel **wrch, struct pcm_channel **rdch) { struct pcm_channel **ch, *wch, *rch, *c; @@ -380,9 +380,9 @@ sysctl_dev_pcm_vchanmode(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d); @@ -482,9 +482,9 @@ sysctl_dev_pcm_vchanrate(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d); @@ -591,9 +591,9 @@ sysctl_dev_pcm_vchanformat(SYSCTL_HANDLER_ARGS) PCM_UNLOCK(d); if (direction == PCMDIR_PLAY) - pcm_getparentchannel(d, &c, NULL); + vchan_getparentchannel(d, &c, NULL); else - pcm_getparentchannel(d, NULL, &c); + vchan_getparentchannel(d, NULL, &c); if (c == NULL) { PCM_RELEASE_QUICK(d);
