Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 09 Jan 2026 23:28:00 +0000
From:      Christos Margiolis <christos@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 2a8f866ede21 - stable/15 - sound: Retire mpu_callbackp()
Message-ID:  <69618f00.32d9a.22ad239a@gitrepo.freebsd.org>
index | next in thread | raw e-mail 

The branch stable/15 has been updated by christos:

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

commit 2a8f866ede21d6cf8ec8ced7c58d72f73d1f8416
Author:     Christos Margiolis <christos@FreeBSD.org>
AuthorDate: 2026-01-02 16:56:58 +0000
Commit:     Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-01-09 23:27:24 +0000

    sound: Retire mpu_callbackp()
    
    It is the exact same as mpu_callback().
    
    No functional changed intended.
    
    Sponsored by:   The FreeBSD Foundation
    MFC after:      1 week
    
    (cherry picked from commit e3b57ceffef0158a72a7a5aedfa9df88b3a8a88b)
---
 sys/dev/sound/midi/midi.c   | 2 +-
 sys/dev/sound/midi/mpu401.c | 8 --------
 sys/dev/sound/midi/mpu_if.m | 6 ------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/sys/dev/sound/midi/midi.c b/sys/dev/sound/midi/midi.c
index e0a782bc9a22..bde3c5447705 100644
--- a/sys/dev/sound/midi/midi.c
+++ b/sys/dev/sound/midi/midi.c
@@ -242,7 +242,7 @@ midi_out(struct snd_midi *m, uint8_t *buf, int size)
 		MIDIQ_DEQ(m->outq, buf, used);
 	if (MIDIQ_EMPTY(m->outq)) {
 		m->flags &= ~M_TXEN;
-		MPU_CALLBACKP(m, m->cookie, m->flags);
+		MPU_CALLBACK(m, m->cookie, m->flags);
 	}
 	if (used && MIDIQ_AVAIL(m->outq) > m->hiwat) {
 		if (m->wchan) {
diff --git a/sys/dev/sound/midi/mpu401.c b/sys/dev/sound/midi/mpu401.c
index 21141a0c8e3c..107a53119cdb 100644
--- a/sys/dev/sound/midi/mpu401.c
+++ b/sys/dev/sound/midi/mpu401.c
@@ -76,7 +76,6 @@ static int mpu401_muninit(struct snd_midi *, void *);
 static int mpu401_minqsize(struct snd_midi *, void *);
 static int mpu401_moutqsize(struct snd_midi *, void *);
 static void mpu401_mcallback(struct snd_midi *, void *, int);
-static void mpu401_mcallbackp(struct snd_midi *, void *, int);
 
 static kobj_method_t mpu401_methods[] = {
 	KOBJMETHOD(mpu_init, mpu401_minit),
@@ -84,7 +83,6 @@ static kobj_method_t mpu401_methods[] = {
 	KOBJMETHOD(mpu_inqsize, mpu401_minqsize),
 	KOBJMETHOD(mpu_outqsize, mpu401_moutqsize),
 	KOBJMETHOD(mpu_callback, mpu401_mcallback),
-	KOBJMETHOD(mpu_callbackp, mpu401_mcallbackp),
 	KOBJMETHOD_END
 };
 
@@ -235,9 +233,3 @@ mpu401_mcallback(struct snd_midi *sm, void *arg, int flags)
 	}
 	m->flags = flags;
 }
-
-static void
-mpu401_mcallbackp(struct snd_midi *sm, void *arg, int flags)
-{
-	mpu401_mcallback(sm, arg, flags);
-}
diff --git a/sys/dev/sound/midi/mpu_if.m b/sys/dev/sound/midi/mpu_if.m
index 835d887f703a..07371a0dd726 100644
--- a/sys/dev/sound/midi/mpu_if.m
+++ b/sys/dev/sound/midi/mpu_if.m
@@ -44,12 +44,6 @@ METHOD int init {
 	void   *_cookie;
 };
 
-METHOD void callbackp {
-	struct snd_midi *_kobj;
-	void   *_cookie;
-	int	_flags;
-};
-
 METHOD void callback {
 	struct snd_midi *_kobj;
 	void   *_cookie;
home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69618f00.32d9a.22ad239a>